Merge remote-tracking branch 'upstream/main'

1 files changed, 15 insertions, 20 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5e2e8b34..dafcdc74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ name: CI
 on:
   pull_request:
   push:
-    branches: ["ghc-9.2"]
+    branches: ["ghc-head"]
 
 jobs:
   cabal:
@@ -15,46 +15,41 @@ jobs:
         os: [ubuntu-latest]
         cabal: ["3.6"]
         ghc:
-          - "9.2.2"
+          - "head"
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v2
+      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/ghc-head'
 
-    - uses: haskell/actions/setup@v2
+    - name: Install gmp and tinfo
+      run: |
+        sudo -- sh -c "apt-get update"
+        sudo -- sh -c "apt-get -y install libgmp-dev libtinfo-dev"
+
+    - uses: haskell/actions/setup@main
       id: setup-haskell-cabal
       name: Setup Haskell
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ matrix.cabal }}
 
-    # GitHub preinstalls recent GHC versions, and haskell/actions/setup uses the
-    # preinstalled version when possible. However, GitHub's preinstalled GHC does
-    # not include documentation, and we need documentation to run Haddock tests.
-    # Therefore, we reinstall GHC to ensure that we have the documentation we
-    # need.
-    - name: Reinstall GHC with docs
-      run: |
-        if [[ ! -e ~/.ghcup/ghc/${{ matrix.ghc }}/share/doc ]]; then
-          ghcup install ghc --force ${{ matrix.ghc }} --set
-        fi
+    - name: Prepare environment
+      run: echo "$HOME/.ghcup/bin" >> $GITHUB_PATH
 
-    - name: Setup
+    - name: Freeze
       run: |
-        cabal configure --with-compiler ghc-${{ matrix.ghc }} --enable-tests --enable-benchmarks --test-show-details=direct
         cabal freeze
-
+ 
     - uses: actions/cache@v2
       name: Cache ~/.cabal/store
       with:
         path: |
           ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
-          dist-newstyle
         key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
-        restore-keys: |
-          ${{ runner.os }}-cabal-${{ matrix.ghc }}
 
     - name: Build
       run: |
+        cabal configure --enable-tests --enable-benchmarks --test-show-details=direct
         cabal build all
 
     - name: Test