From 1e149bb2aeabd36d17622eedbb0ef273d465130d Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Tue, 18 Dec 2018 18:51:27 -0500 Subject: gitlab-ci: Make Windows PATH more robust --- .gitlab-ci.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1aa2cc8cbf..8ddabfc037 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -227,6 +227,7 @@ validate-x86_64-windows-hadrian: variables: GHC_VERSION: "8.6.2" script: + - PATH=C:\msys64\usr\bin;%PATH% - bash .gitlab/win32-init.sh - | set MSYSTEM=MINGW64 @@ -254,7 +255,8 @@ validate-x86_64-windows: variables: GHC_VERSION: "8.6.2" script: - - bash -e .gitlab/win32-init.sh + - PATH=C:\msys64\usr\bin;%PATH% + - bash .gitlab/win32-init.sh - | set MSYSTEM=MINGW64 python boot @@ -296,6 +298,18 @@ validate-x86_64-windows: # This requires updating the maximum artifacts size limit in Gitlab to # something like 200MB. +circleci-validate-x86_64-linux-deb8: + extends: .circleci + script: ".gitlab/circle-ci-job.sh validate-x86_64-linux-deb8" + +circleci-validate-i386-linux-deb8: + extends: .circleci + script: ".gitlab/circle-ci-job.sh validate-i386-linux-deb8" + +# circleci-validate-x86_64-freebsd: +# extends: .circleci +# script: ".gitlab/circle-ci-job.sh validate-x86_64-freebsd" + circleci-validate-x86_64-darwin: extends: .circleci script: ".gitlab/circle-ci-job.sh validate-x86_64-darwin" -- cgit v1.2.1