From ccde733793eecea9423e5ec207015a97e1126b59 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:00:08 +0200 Subject: [PATCH 01/14] Add a drone.yml for tea-ci. --- .drone.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000..03e02895a --- /dev/null +++ b/.drone.yml @@ -0,0 +1,6 @@ +build: + image: teaci/msys32 + shell: sh + commands: + - make PREFIX=/tmp/acki +ack + From 5377c1cc823c63d5d32abcd04c78fc44e5800e4c Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:02:48 +0200 Subject: [PATCH 02/14] Looks like sh-on-windows isn't working. --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 03e02895a..02f9d8c85 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,7 @@ build: image: teaci/msys32 - shell: sh + pull: true + shell: mingw32 commands: - make PREFIX=/tmp/acki +ack From 2666268af71284140b4be3a9a5dbdbfc64630af8 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:04:12 +0200 Subject: [PATCH 03/14] Install ninja before building. --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 02f9d8c85..c037e50df 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,5 +3,6 @@ build: pull: true shell: mingw32 commands: + - pacman -S --needed --noconfirm --noprogressbar ninja - make PREFIX=/tmp/acki +ack From 10785e97916c2be4976338484c6161ba1b473be3 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:07:28 +0200 Subject: [PATCH 04/14] msys32 doesn't work; try Cygwin instead. --- .drone.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index c037e50df..c8c6e338b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,8 +1,10 @@ build: - image: teaci/msys32 + image: teaci/cygwin32 pull: true - shell: mingw32 + shell: cygwin32 commands: - - pacman -S --needed --noconfirm --noprogressbar ninja + - uname -a + - id + - C:/cygwin-installer.exe --site http://mirrors.tea-ci.org/cygwin --local-package-dir Z:/tmp/cygwin -W -P ninja - make PREFIX=/tmp/acki +ack From d1a00f2f4880e6f46563277e728f0f07d01ae51c Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:12:14 +0200 Subject: [PATCH 05/14] Let's try sh-on-windows as well. --- .drone.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index c8c6e338b..8303212f9 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,10 +1,20 @@ +clone: + depth: 10 build: - image: teaci/cygwin32 - pull: true - shell: cygwin32 - commands: - - uname -a - - id - - C:/cygwin-installer.exe --site http://mirrors.tea-ci.org/cygwin --local-package-dir Z:/tmp/cygwin -W -P ninja - - make PREFIX=/tmp/acki +ack + cygwin: + image: teaci/cygwin32 + pull: true + shell: cygwin32 + commands: + - uname -a + - id + - C:/cygwin-installer.exe --site http://mirrors.tea-ci.org/cygwin --local-package-dir Z:/tmp/cygwin -W -P ninja + - make PREFIX=/tmp/acki +ack + linuxonwindows: + image: teaci/msys32 + pull: true + shell: sh + commands: + - apt install build-essentials ninja + - make From e886186890999e8b5830931e45afb04a201062ae Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:17:50 +0200 Subject: [PATCH 06/14] Cygwin setup is very slow, so put sh-on-windows first for testing. --- .drone.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8303212f9..41cbed944 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,13 @@ clone: depth: 10 build: + linuxonwindows: + image: teaci/msys32 + pull: true + shell: sh + commands: + - apt install build-essentials ninja + - make cygwin: image: teaci/cygwin32 pull: true @@ -10,11 +17,4 @@ build: - id - C:/cygwin-installer.exe --site http://mirrors.tea-ci.org/cygwin --local-package-dir Z:/tmp/cygwin -W -P ninja - make PREFIX=/tmp/acki +ack - linuxonwindows: - image: teaci/msys32 - pull: true - shell: sh - commands: - - apt install build-essentials ninja - - make From 0a735d43e62430ef38f5ae7e639edc095204824c Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:18:25 +0200 Subject: [PATCH 07/14] Typo fix. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 41cbed944..e51567331 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ build: pull: true shell: sh commands: - - apt install build-essentials ninja + - apt install build-essential ninja - make cygwin: image: teaci/cygwin32 From e4ba1558869307244f53bfad77144eff3806a062 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:19:16 +0200 Subject: [PATCH 08/14] Update apt before installing. --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index e51567331..b42e4876f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,6 +6,7 @@ build: pull: true shell: sh commands: + - apt update - apt install build-essential ninja - make cygwin: From bc1a63969783d77f53960734d5ea4b6990c5dfb6 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:23:39 +0200 Subject: [PATCH 09/14] No luck with ninja --- make should work? --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b42e4876f..84a5ecc16 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ build: shell: sh commands: - apt update - - apt install build-essential ninja + - apt install build-essential - make cygwin: image: teaci/cygwin32 From a7719a8fe68918c625f90e572b857795aa3d409a Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:25:03 +0200 Subject: [PATCH 10/14] Add bison and flex. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 84a5ecc16..f6a8f56b8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ build: shell: sh commands: - apt update - - apt install build-essential + - apt install build-essential bison flex - make cygwin: image: teaci/cygwin32 From b57900c638ee09ac9288d29eb492085b04e8a510 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:31:45 +0200 Subject: [PATCH 11/14] Experiment with a build matrix and msys32. --- .drone.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index f6a8f56b8..dc4c91292 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,21 +1,15 @@ clone: depth: 10 build: - linuxonwindows: image: teaci/msys32 pull: true - shell: sh + shell: $$shell commands: - - apt update - - apt install build-essential bison flex - - make - cygwin: - image: teaci/cygwin32 - pull: true - shell: cygwin32 - commands: - - uname -a - - id - - C:/cygwin-installer.exe --site http://mirrors.tea-ci.org/cygwin --local-package-dir Z:/tmp/cygwin -W -P ninja + - if [ $$arch == sh ]; then apt update; apt install build-essential bison flex; fi - make PREFIX=/tmp/acki +ack +matrix: + arch: + - sh + - msys32 + From 269484f64a7ea5c1caee524ac10d00de7962c1a2 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:32:26 +0200 Subject: [PATCH 12/14] Typo fix. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index dc4c91292..8981a3896 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ clone: build: image: teaci/msys32 pull: true - shell: $$shell + shell: $$arch commands: - if [ $$arch == sh ]; then apt update; apt install build-essential bison flex; fi - make PREFIX=/tmp/acki +ack From f09182eb3743657a0cc9ca1cb66d3715db4828a4 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:34:29 +0200 Subject: [PATCH 13/14] Another typo fix. --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 8981a3896..ecbec26c1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ build: pull: true shell: $$arch commands: - - if [ $$arch == sh ]; then apt update; apt install build-essential bison flex; fi + - if [ $$arch = sh ]; then apt update; apt install build-essential bison flex; fi - make PREFIX=/tmp/acki +ack matrix: From 6f74f1caf38c4ba3f9ada5ac7d686f6ffaf93c15 Mon Sep 17 00:00:00 2001 From: David Given Date: Sat, 1 Sep 2018 11:43:52 +0200 Subject: [PATCH 14/14] Disable the msys32 build because it doesn't work (due to brk issues). --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index ecbec26c1..1f0a4d38a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,5 +11,5 @@ build: matrix: arch: - sh - - msys32 + #- msys32