gitlab-ci: Make Windows PATH more robust
authorBen Gamari <ben@smart-cactus.org>
Tue, 18 Dec 2018 23:51:27 +0000 (18:51 -0500)
committerBen Gamari <ben@smart-cactus.org>
Wed, 19 Dec 2018 03:37:12 +0000 (22:37 -0500)
.gitlab-ci.yml

index 1aa2cc8..8ddabfc 100644 (file)
@@ -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"