Regenerate CI

ku-fpg · Dec 28, 2024 · 4718f61 · 4718f61
1 parent 20ff4e3
commit 4718f61
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.19.20240708
+# version: 0.19.20241223
 #
-# REGENDATA ("0.19.20240708",["github","cabal.project"])
+# REGENDATA ("0.19.20241223",["github","cabal.project"])
 #
 name: Haskell-CI
 on:
@@ -33,9 +33,9 @@ jobs:
             compilerVersion: 9.10.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.8.2
+          - compiler: ghc-9.8.4
             compilerKind: ghc
-            compilerVersion: 9.8.2
+            compilerVersion: 9.8.4
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.6.6
@@ -80,15 +80,29 @@ jobs:
             allow-failure: false
       fail-fast: false
     steps:
-      - name: apt
+      - name: apt-get install
         run: |
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
+      - name: Install GHCup
+        run: |
           mkdir -p "$HOME/.ghcup/bin"
           curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
+      - name: Install cabal-install
+        run: |
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+      - name: Install GHC (GHCup)
+        if: matrix.setup-method == 'ghcup'
+        run: |
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
+          echo "HC=$HC" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -99,21 +113,12 @@ jobs:
           echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
           echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
           echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
-          HCDIR=/opt/$HCKIND/$HCVER
-          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
-          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
-          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
-          echo "HC=$HC" >> "$GITHUB_ENV"
-          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
-          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
           echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
-          echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -196,8 +201,6 @@ jobs:
           echo "packages: ${PKGDIR_blank_canvas_examples}" >> cabal.project
           echo "packages: ${PKGDIR_wiki_suite}" >> cabal.project
           cat >> cabal.project <<EOF
-          allow-newer: websockets:containers
-
           source-repository-package
             type:     git
             location: https://github.com/ku-fpg/javascript-bridge
@@ -242,8 +245,8 @@ jobs:
         run: |
           $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
       - name: save cache
-        uses: actions/cache/save@v4
         if: always()
+        uses: actions/cache/save@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
diff --git a/blank-canvas.cabal b/blank-canvas.cabal
@@ -49,7 +49,7 @@ tested-with:         GHC == 8.4.4
                    , GHC == 9.2.8
                    , GHC == 9.4.8
                    , GHC == 9.6.6
-                   , GHC == 9.8.2
+                   , GHC == 9.8.4
                    , GHC == 9.10.1
 data-files:
     static/index.html

diff --git a/cabal.project b/cabal.project
@@ -9,6 +9,3 @@ source-repository-package
   type: git
   location: https://github.com/ku-fpg/javascript-bridge
   tag: 683aff351c70c1ccb7cff6227fc14241ac4ada48
-
--- Workaround until https://github.com/jaspervdj/websockets/pull/254 is merged
-allow-newer: websockets:containers
diff --git a/examples/blank-canvas-examples.cabal b/examples/blank-canvas-examples.cabal
@@ -21,7 +21,7 @@ tested-with:         GHC == 8.4.4
                    , GHC == 9.2.8
                    , GHC == 9.4.8
                    , GHC == 9.6.6
-                   , GHC == 9.8.2
+                   , GHC == 9.8.4
                    , GHC == 9.10.1
 data-files:
     static/data/dataURL.txt

diff --git a/wiki-suite/wiki-suite.cabal b/wiki-suite/wiki-suite.cabal
@@ -16,7 +16,7 @@ tested-with:         GHC == 8.4.4
                    , GHC == 9.2.8
                    , GHC == 9.4.8
                    , GHC == 9.6.6
-                   , GHC == 9.8.2
+                   , GHC == 9.8.4
                    , GHC == 9.10.1
 data-files:          images/Haskell.jpg
                      images/House.jpg