Merge branch 'master' into fix-shellcmd-string-arg

gregwebs · Jan 15, 2023 · 75c2f81 · 75c2f81
2 parents ebe2bf7 + 9d58cab
commit 75c2f81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 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.15.20221107
+# version: 0.15.20221225
 #
-# REGENDATA ("0.15.20221107",["github","shelly.cabal"])
+# REGENDATA ("0.15.20221225",["github","shelly.cabal"])
 #
 name: Haskell-CI
 on:
@@ -32,21 +32,16 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.4.1
+          - compiler: ghc-9.4.4
             compilerKind: ghc
-            compilerVersion: 9.4.1
+            compilerVersion: 9.4.4
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.2.5
             compilerKind: ghc
             compilerVersion: 9.2.5
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.2.3
-            compilerKind: ghc
-            compilerVersion: 9.2.3
-            setup-method: ghcup
-            allow-failure: false
           - compiler: ghc-9.0.2
             compilerKind: ghc
             compilerVersion: 9.0.2
@@ -184,7 +179,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: source
       - name: initial cabal.project for sdist
@@ -220,7 +215,7 @@ jobs:
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
           cabal-plan
       - name: cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store

diff --git a/.github/workflows/mac-win-ci.yml b/.github/workflows/mac-win-ci.yml
@@ -18,7 +18,8 @@ jobs:
           - 8.8.4
           - 8.10.7
           - 9.0.2
-          - 9.2.2
+          - 9.2.5
+          - 9.4.4
       fail-fast: false
 
     # 2021-11-14
@@ -29,9 +30,9 @@ jobs:
     # continue-on-error: ${{ startsWith(matrix.os, 'windows') && startsWith(matrix.ghc, '9.2') }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
-    - uses: haskell/actions/setup@v1
+    - uses: haskell/actions/setup@v2
       id: setup-haskell-cabal
       name: Setup Haskell
       with:
@@ -41,7 +42,7 @@ jobs:
       run: |
         cabal freeze
 
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       name: Cache ~/.cabal/store
       with:
         path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

diff --git a/shelly.cabal b/shelly.cabal
@@ -30,9 +30,8 @@ Build-type:          Simple
 Cabal-version:       >=1.10
 
 tested-with:
-  GHC == 9.4.1
+  GHC == 9.4.4
   GHC == 9.2.5
-  GHC == 9.2.3
   GHC == 9.0.2
   GHC == 8.10.7
   GHC == 8.8.4