[Git][ghc/ghc][wip/backports] gitlab-ci: Use hadrian builds for Windows release artifacts

[Ben Gamari]

Ben Gamari pushed to branch wip/backports at Glasgow Haskell Compiler / GHC


Commits:
71fa1a16 by Ben Gamari at 2020-09-17T15:20:33-04:00
gitlab-ci: Use hadrian builds for Windows release artifacts

(cherry picked from commit d4bc9f0de7992f60bce403731019829f6248cc2c)

- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -826,13 +826,16 @@ validate-x86_64-linux-fedora27:
       - ghc.tar.xz
       - junit.xml
 
-validate-x86_64-windows-hadrian:
+.build-x86_64-windows-hadrian:
   extends: .build-windows-hadrian
   variables:
     MSYSTEM: MINGW64
-    TEST_ENV: "x86_64-windows-hadrian"
+    TEST_ENV: "x86_64-windows"
   cache:
-    key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION"
+    key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION"
+
+validate-x86_64-windows-hadrian:
+  extends: .build-x86_64-windows-hadrian
 
 .build-windows-make:
   extends: .build-windows
@@ -873,13 +876,14 @@ nightly-x86_64-windows:
   variables:
     BUILD_FLAVOUR: "validate"
 
-# Normal Windows validate builds are profiled; that won't do for releases.
+# Normal Windows validate builds lack profiled libraries; that won't do for
+# releases.
 release-x86_64-windows:
   <<: *release
   extends: .build-x86_64-windows-hadrian
   variables:
     BUILD_FLAVOUR: "perf"
-    #
+
 release-x86_64-windows-integer-simple:
   <<: *release
   extends: .build-x86_64-windows-hadrian



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/71fa1a167ab0fe7ec8a4ec6d0e16b37d63719198

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/71fa1a167ab0fe7ec8a4ec6d0e16b37d63719198
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200917/e4ab3bf6/attachment-0001.html>