[Git][ghc/ghc][master] 2 commits: ghcup-metadata: Also updates ghcup-nightlies-0.0.7.yaml file

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
8d1b75cb by Matthew Pickering at 2023-07-07T02:40:15-04:00
ghcup-metadata: Also updates ghcup-nightlies-0.0.7.yaml file

Fixes #23600

- - - - -
e524fa7f by Matthew Pickering at 2023-07-07T02:40:15-04:00
ghcup-metadata: Use dynamically linked alpine bindists

In theory these will work much better on alpine to allow people to build
statically linked applications there. We don't need to distribute a
statically linked application ourselves in order to allow that.

Fixes #23602

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab/generate-ci/gen_ci.hs


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -1044,7 +1044,7 @@ ghcup-metadata-nightly:
       artifacts: false
     - job: nightly-x86_64-windows-validate
       artifacts: false
-    - job: nightly-x86_64-linux-alpine3_12-int_native-validate+fully_static
+    - job: nightly-x86_64-linux-alpine3_12-validate
       artifacts: false
     - job: nightly-x86_64-linux-deb9-validate
       artifacts: false
@@ -1081,6 +1081,7 @@ ghcup-metadata-nightly-push:
     - git clone https://gitlab.haskell.org/ghc/ghcup-metadata.git
     - PipelineYear="$(date -d $CI_PIPELINE_CREATED_AT +%Y)"
     - cp metadata_test.yaml "ghcup-metadata/ghcup-nightlies-$PipelineYear-0.0.7.yaml"
+    - cp metadata_test.yaml "ghcup-metadata/ghcup-nightlies-0.0.7.yaml"
     - cd ghcup-metadata
     - git config user.email "ghc-ci at gitlab-haskell.org"
     - git config user.name "GHC GitLab CI"


=====================================
.gitlab/generate-ci/gen_ci.hs
=====================================
@@ -989,7 +989,7 @@ platform_mapping :: Map String (JobGroup BindistInfo)
 platform_mapping = Map.map go $
   Map.fromListWith combine [ (uncurry mkPlatform (jobPlatform (jobInfo $ v j)), j) | j <- filter hasReleaseBuild job_groups ]
   where
-    whitelist = [ "x86_64-linux-alpine3_12-int_native-validate+fully_static"
+    whitelist = [ "x86_64-linux-alpine3_12-validate"
                 , "x86_64-linux-deb10-validate"
                 , "x86_64-linux-deb11-validate"
                 , "x86_64-linux-fedora33-release"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d3de8668aea2209fefbfcf8704c38fe73300a99b...e524fa7f67259a093aeb21aada139137626c581c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/d3de8668aea2209fefbfcf8704c38fe73300a99b...e524fa7f67259a093aeb21aada139137626c581c
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/20230707/bc358f43/attachment-0001.html>