[Git][ghc/ghc][wip/ci-docs] 2 commits: Attempt to fix darwin

[Matthew Pickering (@mpickering)]

Matthew Pickering pushed to branch wip/ci-docs at Glasgow Haskell Compiler / GHC


Commits:
fccfe85d by Matthew Pickering at 2024-02-26T12:35:11+00:00
Attempt to fix darwin

- - - - -
fadd53bc by Matthew Pickering at 2024-02-26T13:34:45+00:00
Remove 9.4.8 bootstrap testing job

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab/darwin/toolchain.nix


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -101,8 +101,6 @@ workflow:
 # which versions of GHC to allow bootstrap with
 .bootstrap_matrix : &bootstrap_matrix
   matrix:
-    - GHC_VERSION: 9.4.8
-      DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10-ghc9_4:$DOCKER_REV"
     - GHC_VERSION: 9.6.4
       DOCKER_IMAGE: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb10-ghc9_6:$DOCKER_REV"
     - GHC_VERSION: 9.8.1


=====================================
.gitlab/darwin/toolchain.nix
=====================================
@@ -30,6 +30,7 @@ let
     configureFlags = [
       "CC=/usr/bin/clang"
       "CLANG=/usr/bin/clang"
+      "AR=/usr/bin/ar"
       "LLC=${llvm}/bin/llc"
       "OPT=${llvm}/bin/opt"
       "CONF_CC_OPTS_STAGE2=--target=${targetTriple}"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/59a91a979ad3b5dba415d8858faa0af88222ec40...fadd53bcf0f42d70096d2ecc6c3afa3570cdc0c3

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/59a91a979ad3b5dba415d8858faa0af88222ec40...fadd53bcf0f42d70096d2ecc6c3afa3570cdc0c3
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/20240226/a06fda0b/attachment.html>