cabal for ci (#541)

* use cabal to build/run the ci script * update build instructions, remove azure tests
digital-asset · Jul 24, 2024 · 73e1ea4 · 73e1ea4
1 parent b901fad
commit 73e1ea4
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 383 deletions.
diff --git a/.github/workflows/ghc-lib-da-ghc-8.4.3.yml b/.github/workflows/ghc-lib-da-ghc-8.4.3.yml
@@ -1,6 +1,7 @@
 name: ghc-lib-da-ghc-8.4.3
 on:
   push:
+  pull_request:
 jobs:
   runhaskell:
     name: ${{ matrix.os }}
@@ -11,53 +12,36 @@ jobs:
         os: [ubuntu, windows]
     steps:
       - uses: actions/checkout@v4
-      - name: Install msys2 (windows)
+      - name: Configure msys2 (windows)
         shell: bash
         run: |-
-          cd /c
-          curl -L https://github.com/commercialhaskell/stackage-content/releases/download/msys2-20230526/msys2-20230526-x86_64.tar.xz -o msys2-20230526-x86_64.tar.xz
-          tar xvf ./msys2-20230526-x86_64.tar.xz > /dev/null
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Install ghcup
+      - name: Install ghcup (windows)
         shell: bash
         run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
-            BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
-            BOOTSTRAP_HASKELL_GHC_VERSION=8.4.3 \
-            BOOTSTRAP_HASKELL_CABAL_VERSION=latest \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \
-            BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-      - name: Setup cabal (windows)
-        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
-        run: |-
-          PATH=/c/cabal/bin:/c/.ghcup/ghc-8.4.3/bin:/c/.ghcup/bin:$PATH
-          export PATH
-          cabal update
-          cabal install alex happy
-          cabal --store-dir="c:\\cabal\\store" --lib --force-reinstalls --package-env=- install extra-1.6.13 optparse-applicative-0.14.3.0 
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=8.4.3 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          echo "/c/ghcup/bin" >> $GITHUB_PATH
+          echo "/c/ghcup/ghc/8.4.3/bin" >> $GITHUB_PATH
+          echo "/c/cabal/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Setup cabal(unix)
+      - name: Install ghcup (unix)
         shell: bash
         run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/8.4.3/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          cabal install alex happy
-          cabal --store-dir=$HOME/.cabal/store --lib --force-reinstalls --package-env=- install extra-1.6.13 optparse-applicative-0.14.3.0
-        if: matrix.os == 'ubuntu' || matrix.os == 'macos'
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=8.4.3 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
+          echo "$HOME/.ghcup/ghc/8.4.3/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
-          PATH=/c/cabal/bin:/c/ghcup/ghc/8.4.3/bin:/c/ghcup/bin:/c/msys64/usr/bin:/c/mingw64/bin:"/c/program files/git/bin":"$PATH"
-          export PATH
-          MSYSTEM=CLANG64; export MSYSTEM
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=/c/cabal/store/$(ls /c/cabal/store)/package.db CI.hs --da
+          cabal run exe:ghc-lib-build-tool -- --da
         if: matrix.os == 'windows'
       - name: Run CI.hs (unix)
         shell: bash
-        run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/8.4.3/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=$HOME/.cabal/store/$(ls $HOME/.cabal/store)/package.db CI.hs --da
+        run: cabal run exe:ghc-lib-build-tool -- --da
         if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
diff --git a/.github/workflows/ghc-lib-ghc-9.10.1-ghc-9.8.2.yml b/.github/workflows/ghc-lib-ghc-9.10.1-ghc-9.8.2.yml
@@ -1,6 +1,7 @@
 name: ghc-lib-ghc-9.10.1-ghc-9.8.2
 on:
   push:
+  pull_request:
 jobs:
   runhaskell:
     name: ${{ matrix.os }}
@@ -14,53 +15,36 @@ jobs:
       - name: Install build tools (macOS)
         run: brew install automake
         if: matrix.os == 'macos'
-      - name: Install msys2 (windows)
+      - name: Configure msys2 (windows)
         shell: bash
         run: |-
-          cd /c
-          curl -L https://github.com/commercialhaskell/stackage-content/releases/download/msys2-20230526/msys2-20230526-x86_64.tar.xz -o msys2-20230526-x86_64.tar.xz
-          tar xvf ./msys2-20230526-x86_64.tar.xz > /dev/null
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Install ghcup
+      - name: Install ghcup (windows)
         shell: bash
         run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
-            BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
-            BOOTSTRAP_HASKELL_GHC_VERSION=9.8.2 \
-            BOOTSTRAP_HASKELL_CABAL_VERSION=latest \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \
-            BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-      - name: Setup cabal (windows)
-        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
-        run: |-
-          PATH=/c/cabal/bin:/c/.ghcup/ghc-9.8.2/bin:/c/.ghcup/bin:$PATH
-          export PATH
-          cabal update
-          cabal install alex happy
-          cabal --store-dir="c:\\cabal\\store" --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.8.2 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          echo "/c/ghcup/bin" >> $GITHUB_PATH
+          echo "/c/ghcup/ghc/9.8.2/bin" >> $GITHUB_PATH
+          echo "/c/cabal/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Setup cabal(unix)
+      - name: Install ghcup (unix)
         shell: bash
         run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/9.8.2/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          cabal install alex happy
-          cabal --store-dir=$HOME/.cabal/store --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
-        if: matrix.os == 'ubuntu' || matrix.os == 'macos'
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.8.2 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
+          echo "$HOME/.ghcup/ghc/9.8.2/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
-          PATH=/c/cabal/bin:/c/ghcup/ghc/9.8.2/bin:/c/ghcup/bin:/c/msys64/usr/bin:/c/mingw64/bin:"/c/program files/git/bin":"$PATH"
-          export PATH
-          MSYSTEM=CLANG64; export MSYSTEM
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=/c/cabal/store/$(ls /c/cabal/store)/package.db CI.hs --ghc-flavor ghc-9.10.1
+          cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.10.1
         if: matrix.os == 'windows'
       - name: Run CI.hs (unix)
         shell: bash
-        run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/9.8.2/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=$HOME/.cabal/store/$(ls $HOME/.cabal/store)/package.db CI.hs --ghc-flavor ghc-9.10.1
+        run: cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.10.1
         if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
diff --git a/.github/workflows/ghc-lib-ghc-9.8.2-ghc-9.6.5.yml b/.github/workflows/ghc-lib-ghc-9.8.2-ghc-9.6.5.yml
@@ -1,6 +1,7 @@
 name: ghc-lib-ghc-9.8.2-ghc-9.6.5
 on:
   push:
+  pull_request:
 jobs:
   runhaskell:
     name: ${{ matrix.os }}
@@ -14,53 +15,36 @@ jobs:
       - name: Install build tools (macOS)
         run: brew install automake
         if: matrix.os == 'macos'
-      - name: Install msys2 (windows)
+      - name: Configure msys2 (windows)
         shell: bash
         run: |-
-          cd /c
-          curl -L https://github.com/commercialhaskell/stackage-content/releases/download/msys2-20230526/msys2-20230526-x86_64.tar.xz -o msys2-20230526-x86_64.tar.xz
-          tar xvf ./msys2-20230526-x86_64.tar.xz > /dev/null
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Install ghcup
+      - name: Install ghcup (windows)
         shell: bash
         run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
-            BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
-            BOOTSTRAP_HASKELL_GHC_VERSION=9.6.5 \
-            BOOTSTRAP_HASKELL_CABAL_VERSION=latest \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \
-            BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-      - name: Setup cabal (windows)
-        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
-        run: |-
-          PATH=/c/cabal/bin:/c/.ghcup/ghc-9.6.5/bin:/c/.ghcup/bin:$PATH
-          export PATH
-          cabal update
-          cabal install alex happy
-          cabal --store-dir="c:\\cabal\\store" --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0 semaphore-compat-1.0.0 
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.6.5 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          echo "/c/ghcup/bin" >> $GITHUB_PATH
+          echo "/c/ghcup/ghc/9.6.5/bin" >> $GITHUB_PATH
+          echo "/c/cabal/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Setup cabal(unix)
+      - name: Install ghcup (unix)
         shell: bash
         run: |-
-          PATH=$HOME/.cabal/bin:$HOME/.ghcup/ghc/9.6.5/bin:$HOME/.ghcup/bin:"$PATH"
-          export PATH
-          cabal install alex happy
-          cabal --store-dir=$HOME/.cabal/store --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0 semaphore-compat-1.0.0 
-        if: matrix.os == 'ubuntu' || matrix.os == 'macos'
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.6.5 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
+          echo "$HOME/.ghcup/ghc/9.6.5/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
-          PATH=/c/cabal/bin:/c/ghcup/ghc/9.6.5/bin:/c/ghcup/bin:/c/msys64/usr/bin:/c/mingw64/bin:"/c/program files/git/bin":"$PATH"
-          export PATH
-          MSYSTEM=CLANG64; export MSYSTEM
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=/c/cabal/store/$(ls /c/cabal/store)/package.db CI.hs --ghc-flavor ghc-9.8.2
+          cabal run exe:ghc-lib-build-tool --constraint='ghc-lib-gen +semaphore-compat' -- --ghc-flavor ghc-9.8.2
         if: matrix.os == 'windows'
       - name: Run CI.hs (unix)
         shell: bash
-        run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/9.6.5/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=$HOME/.cabal/store/$(ls $HOME/.cabal/store)/package.db CI.hs --ghc-flavor ghc-9.8.2
+        run: cabal run exe:ghc-lib-build-tool --constraint='ghc-lib-gen +semaphore-compat' -- --ghc-flavor ghc-9.8.2
         if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
diff --git a/.github/workflows/ghc-lib-ghc-master-ghc-9.10.1.yml b/.github/workflows/ghc-lib-ghc-master-ghc-9.10.1.yml
@@ -1,6 +1,7 @@
 name: ghc-lib-ghc-master-ghc-9.10.1
 on:
   push:
+  pull_request:
 jobs:
   runhaskell:
     name: ${{ matrix.os }}
@@ -14,53 +15,37 @@ jobs:
       - name: Install build tools (macOS)
         run: brew install automake
         if: matrix.os == 'macos'
-      - name: Install msys2 (windows)
+      - name: Configure msys2 (windows)
         shell: bash
         run: |-
-          cd /c
-          curl -L https://github.com/commercialhaskell/stackage-content/releases/download/msys2-20230526/msys2-20230526-x86_64.tar.xz -o msys2-20230526-x86_64.tar.xz
-          tar xvf ./msys2-20230526-x86_64.tar.xz > /dev/null
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Install ghcup
+      - name: Install ghcup (windows)
         shell: bash
         run: |-
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
-            BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \
-            BOOTSTRAP_HASKELL_GHC_VERSION=9.10.1 \
-            BOOTSTRAP_HASKELL_CABAL_VERSION=latest \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 \
-            BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 \
-            BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
-      - name: Setup cabal (windows)
-        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
-        run: |-
-          PATH=/c/cabal/bin:/c/.ghcup/ghc-9.10.1/bin:/c/.ghcup/bin:$PATH
-          export PATH
-          cabal update
-          cabal install alex happy
-          cabal --store-dir="c:\\cabal\\store" --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.10.1 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          echo "/c/ghcup/bin" >> $GITHUB_PATH
+          echo "/c/ghcup/ghc/9.10.1/bin" >> $GITHUB_PATH
+          echo "/c/cabal/bin" >> $GITHUB_PATH
         if: matrix.os == 'windows'
-      - name: Setup cabal(unix)
+      - name: Install ghcup (unix)
         shell: bash
         run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/9.10.1/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          cabal install alex happy
-          cabal --store-dir=$HOME/.cabal/store --lib --force-reinstalls --package-env=- install extra-1.7.16 optparse-applicative-0.18.1.0
-        if: matrix.os == 'ubuntu' || matrix.os == 'macos'
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.10.1 BOOTSTRAP_HASKELL_CABAL_VERSION=latest BOOTSTRAP_HASKELL_INSTALL_NO_STACK=1 BOOTSTRAP_HASKELL_INSTALL_NO_STACK_HOOK=1 BOOTSTRAP_HASKELL_ADJUST_BASHRC=N sh
+          ls "$HOME"/.ghcup/bin
+          echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
+          echo "$HOME/.ghcup/ghc/9.10.1/bin" >> $GITHUB_PATH
+          echo "$HOME/.cabal/bin" >> $GITHUB_PATH
+        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
-          PATH=/c/cabal/bin:/c/ghcup/ghc/9.10.1/bin:/c/ghcup/bin:/c/mingw64/bin:/c/msys64/usr/bin:"/c/program files/git/bin":"$PATH"
-          export PATH
-          MSYSTEM=CLANG64; export MSYSTEM
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=/c/cabal/store/$(ls /c/cabal/store)/package.db CI.hs --ghc-flavor ghc-master
+          cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-master
         if: matrix.os == 'windows'
       - name: Run CI.hs (unix)
         shell: bash
-        run: |-
-          PATH="$HOME/.cabal/bin":"$HOME/.ghcup/ghc/9.10.1/bin":"$HOME/.ghcup/bin":"$PATH"
-          export PATH
-          runghc --ghc-arg=-clear-package-db --ghc-arg=-global-package-db --ghc-arg=-user-package-db --ghc-arg=-package-db --ghc-arg=$HOME/.cabal/store/$(ls $HOME/.cabal/store)/package.db CI.hs --ghc-flavor ghc-master
+        run: cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-master
         if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
diff --git a/CI.hs b/CI.hs
@@ -76,7 +76,7 @@ data DaFlavor = DaFlavor
 
 -- Last tested gitlab.haskell.org/ghc/ghc.git at
 current :: String
-current = "41f1354dafe35aa6023d6c2553793208afa3fc31" -- 2024-07-14
+current = "12d3b66cedd3c80e7c1e030238c92d26631cab8d" -- 2024-07-17
 
 -- Command line argument generators.
 
@@ -365,7 +365,6 @@ buildDists
         pkg_ghclib_parser = "ghc-lib-parser-" ++ version
         ghcFlavorArg = ghcFlavorOpt ghcFlavor
 
-    system_ "cabal update"
     system_ "cabal build exe:ghc-lib-gen"
     system_ $ "cabal run exe:ghc-lib-gen -- ghc ../patches --ghc-lib-parser " ++ ghcFlavorArg ++ " " ++ cppOpts ghcFlavor ++ " " ++ stackResolverOpt resolver
     patchVersion version "ghc/ghc-lib-parser.cabal"
@@ -412,7 +411,7 @@ buildDists
 
     writeFile "cabal.project" (
       unlines $
-        [ "packages: " 
+        [ "packages: "
         , "  ghc-lib-parser/ghc-lib-parser.cabal"
         , "  ghc-lib/ghc-lib.cabal"
         , "  examples/ghc-lib-test-utils/ghc-lib-test-utils.cabal"
@@ -440,7 +439,7 @@ buildDists
       writeCabalCmdFile exe = do
         let filename = exe
             cmd = "cabal run exe:" ++ exe ++ " --project-dir ../.. -- "
-        writeFile filename cmd 
+        writeFile filename cmd
         pure filename
 
       ghcOptionsWithHaddock :: Maybe String -> String