Merge remote-tracking branch 'origin/ghc-9.6x'

haskell · Nov 2, 2024 · 03b46d2 · 03b46d2
2 parents 5c09769 + 2d8b81f
commit 03b46d2
Show file tree

Hide file tree

Showing 47 changed files with 984 additions and 652 deletions.
diff --git a/.github/workflows/cabal.project.yaml b/.github/workflows/cabal.project.yaml
@@ -20,12 +20,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [macOS-12, windows-latest, ubuntu-latest]
-        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8"]
+        ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.6"]
         include:
           - os: macOS-latest
             ghc: "9.2.8"
           - os: macOS-latest
             ghc: "9.4.8"
+          - os: macOS-latest
+            ghc: "9.6.6"
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -21,7 +21,7 @@ jobs:
     name: Build linux binary
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.10.2.0
+      CABAL_VER: 3.10.3.0
       JSON_VERSION: "0.0.8"
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -36,7 +36,7 @@ jobs:
             ARCH: 32
           - os: ubuntu-latest
             ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: 64
     steps:
       - name: Checkout code
@@ -85,7 +85,7 @@ jobs:
     name: Build ARM binary
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.3.0
       JSON_VERSION: "0.0.8"
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -100,7 +100,7 @@ jobs:
             ARCH: ARM
           - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: ARM64
     steps:
       - name: git config
@@ -154,27 +154,28 @@ jobs:
     name: Build binary (Mac/Win)
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.10.2.0
+      CABAL_VER: 3.10.3.0
       MACOSX_DEPLOYMENT_TARGET: 10.13
       JSON_VERSION: "0.0.8"
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       S3_HOST: ${{ secrets.S3_HOST }}
+      LLVM_VER: 16
     strategy:
       fail-fast: false
       matrix:
         include:
           - os: [self-hosted, macOS, ARM64]
             ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: ARM64
           - os: macOS-12
             ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: 64
           - os: windows-latest
             ARTIFACT: "x86_64-mingw64-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: 64
     steps:
       - name: Checkout code
@@ -185,13 +186,8 @@ jobs:
       - if: matrix.ARCH == 'ARM64' && runner.os == 'macOS'
         name: Run build
         run: |
-          bash .github/scripts/brew.sh git coreutils llvm@13 autoconf automake
-          export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@13/bin:$PATH"
-          export CC="$HOME/.brew/opt/llvm@13/bin/clang"
-          export CXX="$HOME/.brew/opt/llvm@13/bin/clang++"
-          export LD=ld
-          export AR="$HOME/.brew/opt/llvm@13/bin/llvm-ar"
-          export RANLIB="$HOME/.brew/opt/llvm@13/bin/llvm-ranlib"
+          bash .github/scripts/brew.sh git coreutils autoconf automake
+          export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
           bash .github/scripts/build.sh
         env:
           ARTIFACT: ${{ matrix.ARTIFACT }}
@@ -246,14 +242,14 @@ jobs:
     name: Build binary (FreeBSD)
     runs-on: [self-hosted, FreeBSD, X64]
     env:
-      CABAL_VER: 3.10.2.0
+      CABAL_VER: 3.10.3.0
       MACOSX_DEPLOYMENT_TARGET: 10.13
       JSON_VERSION: "0.0.8"
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       S3_HOST: ${{ secrets.S3_HOST }}
       ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-      GHC_VER: 9.4.8
+      GHC_VER: 9.6.6
       ARCH: 64
       DISTRO: na
       RUNNER_OS: FreeBSD
@@ -283,7 +279,7 @@ jobs:
     needs: "build-linux"
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.10.2.0
+      CABAL_VER: 3.10.3.0
       JSON_VERSION: "0.0.8"
     strategy:
       matrix:
@@ -295,12 +291,12 @@ jobs:
             DISTRO: Alpine
           - os: ubuntu-latest
             ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: 64
             DISTRO: Alpine
           - os: ubuntu-latest
             ARTIFACT: "x86_64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: 64
             DISTRO: Ubuntu
 
@@ -361,7 +357,7 @@ jobs:
     needs: "build-arm"
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.6.2.0
+      CABAL_VER: 3.10.3.0
       JSON_VERSION: "0.0.8"
     strategy:
       matrix:
@@ -373,7 +369,7 @@ jobs:
             DISTRO: Ubuntu
           - os: [self-hosted, Linux, ARM64, maerwald]
             ARTIFACT: "aarch64-linux-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: ARM64
             DISTRO: Ubuntu
 
@@ -424,25 +420,25 @@ jobs:
     needs: "build-macwin"
     runs-on: ${{ matrix.os }}
     env:
-      CABAL_VER: 3.10.2.0
+      CABAL_VER: 3.10.3.0
       MACOSX_DEPLOYMENT_TARGET: 10.13
       JSON_VERSION: "0.0.8"
     strategy:
       matrix:
         include:
           - os: [self-hosted, macOS, ARM64]
             ARTIFACT: "aarch64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: ARM64
             DISTRO: na
           - os: macOS-12
             ARTIFACT: "x86_64-apple-darwin-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: 64
             DISTRO: na
           - os: windows-latest
             ARTIFACT: "x86_64-mingw64-ghcup"
-            GHC_VER: 9.4.8
+            GHC_VER: 9.6.6
             ARCH: 64
             DISTRO: na
 
@@ -500,11 +496,11 @@ jobs:
     needs: "build-freebsd"
     runs-on: [self-hosted, FreeBSD, X64]
     env:
-      CABAL_VER: 3.10.2.0
+      CABAL_VER: 3.10.3.0
       MACOSX_DEPLOYMENT_TARGET: 10.13
       JSON_VERSION: "0.0.8"
       ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-      GHC_VER: 9.4.8
+      GHC_VER: 9.6.6
       ARCH: 64
       DISTRO: na
       RUNNER_OS: FreeBSD

diff --git a/app/ghcup/Main.hs b/app/ghcup/Main.hs
@@ -33,6 +33,7 @@ import           GHCup.Prelude.Logger
 import           GHCup.Prelude.String.QQ
 import           GHCup.Version
 
+import           Control.Monad (when, forM_, unless)
 import           Control.Concurrent
 import           Control.Concurrent.Async
 import           Control.Exception.Safe

diff --git a/cabal.ghc8107.Unix.project b/cabal.ghc8107.Unix.project
@@ -11,29 +11,26 @@ else
 
 constraints: http-io-streams -brotli,
              any.aeson >= 2.0.1.0,
-             any.hsc2hs ==0.68.8,
+             any.hsc2hs >=0.68.10,
              bzlib-conduit >= 0.3.0.3,
              bz2 >= 1.0.1.1,
              bzlib >= 0.5.2.0,
              directory >= 1.3.8.3,
-             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0
+             filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0,
+             tar >= 0.6.2.0
 
 constraints: text -simdutf
 
 if os(mingw32)
   constraints: zlib +bundled-c-zlib,
                lzma +static,
+               text -simdutf,
                vty-windows >=0.2.0.2
 
   if impl(ghc >= 9.4)
     constraints: language-c >= 0.9.3
 
 
-source-repository-package
-  type: git
-  location: https://github.com/haskell/tar.git
-  tag: d94a988be4311b830149a9f8fc16739927e5fc1c
-
 source-repository-package
   type: git
   location: https://github.com/hasufell/uri-bytestring.git
@@ -45,9 +42,6 @@ package libarchive
 package aeson-pretty
   flags: +lib-only
 
-package cabal-plan
-  flags: -exe
-
 package aeson
   flags: +ordered-keymap
 
@@ -56,6 +50,3 @@ package hashable
 
 package *
   test-show-details: direct
-
-allow-newer: cabal-install-parsers:tar
-