Commit 1e149bb2 authored by Ben Gamari's avatar Ben Gamari 🐢
Browse files

gitlab-ci: Make Windows PATH more robust

parent 548becdd
...@@ -227,6 +227,7 @@ validate-x86_64-windows-hadrian: ...@@ -227,6 +227,7 @@ validate-x86_64-windows-hadrian:
variables: variables:
GHC_VERSION: "8.6.2" GHC_VERSION: "8.6.2"
script: script:
- PATH=C:\msys64\usr\bin;%PATH%
- bash .gitlab/win32-init.sh - bash .gitlab/win32-init.sh
- | - |
set MSYSTEM=MINGW64 set MSYSTEM=MINGW64
...@@ -254,7 +255,8 @@ validate-x86_64-windows: ...@@ -254,7 +255,8 @@ validate-x86_64-windows:
variables: variables:
GHC_VERSION: "8.6.2" GHC_VERSION: "8.6.2"
script: script:
- bash -e .gitlab/win32-init.sh - PATH=C:\msys64\usr\bin;%PATH%
- bash .gitlab/win32-init.sh
- | - |
set MSYSTEM=MINGW64 set MSYSTEM=MINGW64
python boot python boot
...@@ -296,6 +298,18 @@ validate-x86_64-windows: ...@@ -296,6 +298,18 @@ validate-x86_64-windows:
# This requires updating the maximum artifacts size limit in Gitlab to # This requires updating the maximum artifacts size limit in Gitlab to
# something like 200MB. # 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: circleci-validate-x86_64-darwin:
extends: .circleci extends: .circleci
script: ".gitlab/circle-ci-job.sh validate-x86_64-darwin" script: ".gitlab/circle-ci-job.sh validate-x86_64-darwin"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment