From 44d5e40e3b945bfd46189fa02b3f80632abd517a Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 08:46:39 -0600 Subject: [PATCH 01/10] Attempt buildkite --- .buildkite/pipeline.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .buildkite/pipeline.yml diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml new file mode 100644 index 0000000..6643a59 --- /dev/null +++ b/.buildkite/pipeline.yml @@ -0,0 +1,10 @@ +steps: + - env: + GCLIENT_PY3: 0 + - commands: + - ". $HOME/.asdf/asdf.sh" + - "asdf local erlang 22.1.8" + - "make" + name: ":hammer: build" + agents: + queue: "erlang" From 2ebae980efcc743f5ec4e048bed7b93c694bee42 Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 08:54:55 -0600 Subject: [PATCH 02/10] Try top level env --- .buildkite/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6643a59..eebdd92 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,6 +1,6 @@ +env: + GCLIENT_PY3: 0 steps: - - env: - GCLIENT_PY3: 0 - commands: - ". $HOME/.asdf/asdf.sh" - "asdf local erlang 22.1.8" From d47b834deebee0b88056f656dae099e637f73c86 Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:18:58 -0600 Subject: [PATCH 03/10] cmon env var --- .buildkite/pipeline.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index eebdd92..a03fbb8 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,10 +1,8 @@ -env: - GCLIENT_PY3: 0 steps: - commands: - ". $HOME/.asdf/asdf.sh" - "asdf local erlang 22.1.8" - - "make" + - "make -e GCLIENT_PY3=0" name: ":hammer: build" agents: queue: "erlang" From bef29db23791860f7ef13a28fef84b534076180b Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:31:30 -0600 Subject: [PATCH 04/10] urgh --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index a03fbb8..e96f14d 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ steps: - commands: - ". $HOME/.asdf/asdf.sh" - "asdf local erlang 22.1.8" - - "make -e GCLIENT_PY3=0" + - "make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH name: ":hammer: build" agents: queue: "erlang" From 552074dbe85ed4f6a0baf655962da7556d2c8eab Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:32:11 -0600 Subject: [PATCH 05/10] quoting is good --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index e96f14d..f8051bd 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ steps: - commands: - ". $HOME/.asdf/asdf.sh" - "asdf local erlang 22.1.8" - - "make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH + - "make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH" name: ":hammer: build" agents: queue: "erlang" From 7b3a9608f9bb89857d3b1dd4b98c2179a6aa9d25 Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:42:17 -0600 Subject: [PATCH 06/10] uhh --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index f8051bd..90dc9fc 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ steps: - commands: - ". $HOME/.asdf/asdf.sh" - "asdf local erlang 22.1.8" - - "make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH" + - "asdf reshim; make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH" name: ":hammer: build" agents: queue: "erlang" From 4d5cd590bd1045a6d182956eb46080993d346071 Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:43:12 -0600 Subject: [PATCH 07/10] why is the shim path forgotten? --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 90dc9fc..887c507 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -2,7 +2,7 @@ steps: - commands: - ". $HOME/.asdf/asdf.sh" - "asdf local erlang 22.1.8" - - "asdf reshim; make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH" + - "asdf reshim && make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH" name: ":hammer: build" agents: queue: "erlang" From 6c0e057908ac7db22e8202e24baa247897e41de2 Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:47:05 -0600 Subject: [PATCH 08/10] Is it a shell thing? --- .buildkite/build.sh | 6 ++++++ .buildkite/pipeline.yml | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 .buildkite/build.sh diff --git a/.buildkite/build.sh b/.buildkite/build.sh new file mode 100755 index 0000000..b347b69 --- /dev/null +++ b/.buildkite/build.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -euo pipefail + +asdf local erlang 22.1.8 +make -e GCLIENT_PY3=0 -e PATH="depot_tools/:$PATH" diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 887c507..53b9129 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,8 +1,7 @@ steps: - commands: - ". $HOME/.asdf/asdf.sh" - - "asdf local erlang 22.1.8" - - "asdf reshim && make -e GCLIENT_PY3=0 -e PATH=depot_tools/:$PATH" + - "./buildkite/build.sh" name: ":hammer: build" agents: queue: "erlang" From 23f6a74ebbde2c5f357bcca3fbe16beb8fe1c29d Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:47:40 -0600 Subject: [PATCH 09/10] whoops --- .buildkite/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 53b9129..528e250 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,7 +1,7 @@ steps: - commands: - ". $HOME/.asdf/asdf.sh" - - "./buildkite/build.sh" + - ".buildkite/build.sh" name: ":hammer: build" agents: queue: "erlang" From fd68e87ffb8e63f8e3280ae85c9800f053e01d4b Mon Sep 17 00:00:00 2001 From: Marc Nijdam Date: Thu, 14 May 2020 09:53:43 -0600 Subject: [PATCH 10/10] oh man.. python wants a shim too --- .buildkite/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.buildkite/build.sh b/.buildkite/build.sh index b347b69..171c6a8 100755 --- a/.buildkite/build.sh +++ b/.buildkite/build.sh @@ -3,4 +3,5 @@ set -euo pipefail asdf local erlang 22.1.8 +asdf local python 2.7.18 make -e GCLIENT_PY3=0 -e PATH="depot_tools/:$PATH"