Bump stack CI to GHC-9.2.3 and ubuntu-20.04; restrict CI to master,ci*

Also bump actions/{checkout,cache} to v3
agda · Jul 29, 2022 · d3b8d5d · d3b8d5d
1 parent 0036dc0
commit d3b8d5d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 134 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,18 +8,20 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.15.20220525
+# version: 0.15.20220710
 #
-# REGENDATA ("0.15.20220525",["github","fix-whitespace.cabal"])
+# REGENDATA ("0.15.20220710",["github","fix-whitespace.cabal"])
 #
 name: Haskell-CI
 on:
   push:
     branches:
       - master
+      - ci*
   pull_request:
     branches:
       - master
+      - ci*
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -32,9 +34,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.4.0.20220501
+          - compiler: ghc-9.4.0.20220623
             compilerKind: ghc
-            compilerVersion: 9.4.0.20220501
+            compilerVersion: 9.4.0.20220623
             setup-method: ghcup
             allow-failure: true
           - compiler: ghc-9.2.3
@@ -87,17 +89,17 @@ jobs:
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
-            if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi
-            "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
-            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+            "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
+            "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           else
             apt-add-repository -y 'ppa:hvr/ghc'
             apt-get update
             apt-get install -y "$HCNAME"
             mkdir -p "$HOME/.ghcup/bin"
             curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
-            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           fi
         env:
           HCKIND: ${{ matrix.compilerKind }}
@@ -166,6 +168,7 @@ jobs:
                         26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
                         f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
              key-threshold: 3
+          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
           EOF
           fi
           cat >> $CABAL_CONFIG <<EOF

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -1,18 +1,26 @@
 name: Build by Stack
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - ci*
+  pull_request:
+    branches:
+      - master
+      - ci*
 
 jobs:
   check:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        ghc-ver: [9.2.2, 9.0.2, 8.10.7, 8.8.4, 8.6.5, 8.4.4, 8.2.2, 8.0.2]
+        ghc-ver: [9.2.3, 9.0.2, 8.10.7, 8.8.4, 8.6.5, 8.4.4, 8.2.2, 8.0.2]
       fail-fast: false
     env:
       ARGS: "--stack-yaml stack-${{ matrix.ghc-ver }}.yaml --no-terminal --system-ghc"
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: haskell/actions/setup@v1
       id: haskell-setup
       with:
@@ -25,7 +33,7 @@ jobs:
         export STACK_VER=$(stack --numeric-version)
         echo "STACK_VER=${STACK_VER}" >> ${GITHUB_ENV}
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       name: Cache dependencies
       id: cache
       with:

diff --git a/cabal.haskell-ci b/cabal.haskell-ci
@@ -1 +1 @@
-branches: master
+branches: master ci*
diff --git a/fix-whitespace.cabal b/fix-whitespace.cabal
@@ -33,7 +33,7 @@ extra-source-files:
   stack-8.8.4.yaml
   stack-8.10.7.yaml
   stack-9.0.2.yaml
-  stack-9.2.2.yaml
+  stack-9.2.3.yaml
 
 source-repository head
   type: git

diff --git a/stack-9.2.1.yaml b/stack-9.2.1.yaml
diff --git a/stack-9.2.2.yaml b/stack-9.2.2.yaml
diff --git a/stack-9.2.3.yaml b/stack-9.2.3.yaml
@@ -0,0 +1,3 @@
+resolver: nightly-2022-07-29
+compiler: ghc-9.2.3
+compiler-check: match-exact