Fix #6469 Update GitHub workflow actions

Also makes other minor updates to the actions. Also applies HLint 3.8 suggestions to the code.
commercialhaskell · Feb 1, 2024 · 69f4289 · 69f4289
1 parent 9c5fb9f
commit 69f4289
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -16,7 +16,7 @@ on:
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-# As of 16 December 2023, ubuntu-latest, windows-latest and macos-latest come
+# As of 1 February 2024, ubuntu-latest, windows-latest and macos-latest come
 # with Stack 2.13.1 and GHC 9.8.1. windows-latest comes with NSIS 3.08, for
 # which the default value of the 'Unicode' installer attribute is 'true'.
 # However, that is not the 'large strings' build of NSIS and creates installers
@@ -42,16 +42,16 @@ jobs:
           cache-bust: "2024-01-20"
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Cache dependencies on Unix-like OS
       if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.stack
         key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.cache-bust }}
     - name: Cache dependencies on Windows
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~\AppData\Roaming\stack
@@ -144,7 +144,7 @@ jobs:
         stack etc/scripts/release.hs build ${{ matrix.release-args }}
 
     - name: Upload bindist
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ runner.os }}
         path: _release/stack-*
@@ -186,7 +186,7 @@ jobs:
         echo '::notice title=ARM64 skipped::To build ARM64, a self-hosted runner needs to be configured and the SELF_HOSTED_RUNNERS secret must contain arm64'
     - name: Clone project
       if: needs.configuration.outputs.test-arm64 == 'true'
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Install deps
       shell: bash
       run: |
@@ -217,7 +217,7 @@ jobs:
 
     - name: Upload bindist
       if: needs.configuration.outputs.test-arm64 == 'true'
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Linux-ARM64
         path: _release/stack-*
@@ -234,23 +234,23 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     steps:
     - name: Download Linux artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: Linux
         path: _release
     - name: Download macOS artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: macOS
         path: _release
     - name: Download Windows artifact
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: Windows
         path: _release
     - name: Download Linux-ARM64 artifact
       if: needs.configuration.outputs.test-arm64 == 'true'
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: Linux-ARM64
         path: _release
@@ -270,7 +270,7 @@ jobs:
     - name: Create GitHub release (final)
       id: github_release_final
       if: "!startsWith(github.ref, 'refs/tags/rc/')"
-      uses: ncipollo/release-action@v1.10.0
+      uses: ncipollo/release-action@v1.13.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
@@ -289,7 +289,7 @@ jobs:
     - name: Create GitHub release (release candidate)
       id: github_release_rc
       if: "startsWith(github.ref, 'refs/tags/rc/')"
-      uses: ncipollo/release-action@v1.10.0
+      uses: ncipollo/release-action@v1.13.0
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,15 +14,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Apply yamllint
       uses: ibiqlik/action-yamllint@v3
       with:
         format: github
     - name: Set up HLint
-      uses: haskell/actions/hlint-setup@v2
+      uses: haskell-actions/hlint-setup@v2
       with:
-        version: "3.6.1"
+        version: "3.8"
     - name: Apply HLint
       run: |
         set -ex

diff --git a/.github/workflows/stan.yml b/.github/workflows/stan.yml
@@ -11,10 +11,10 @@ jobs:
 
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Cache dependencies
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.stack
         key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}
@@ -23,7 +23,7 @@ jobs:
       run: |
         git clone https://github.com/kowainik/stan.git
         cd stan
-        stack --compiler ghc-9.6.4 --local-bin-path ../.bin install
+        stack --local-bin-path ../.bin install
         cd ..
 
     - name: Generate .hie for analysis
@@ -33,7 +33,7 @@ jobs:
       run: .bin/stan report --cabal-file-path=stack.cabal
 
     - name: Upload HTML report
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Stan_report
         path: stan.html
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -9,7 +9,7 @@ on:
     - rc/**
   workflow_dispatch:
 
-# As of 16 December 2023, ubuntu-latest, windows-latest and macos-latest come
+# As of 1 February 2024, ubuntu-latest, windows-latest and macos-latest come
 # with Stack 2.13.1 and GHC 9.8.1.
 
 jobs:
@@ -18,9 +18,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Cache dependencies
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.stack
         key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}
@@ -53,16 +53,16 @@ jobs:
           stack-args: ""
     steps:
     - name: Clone project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Cache dependencies on Unix-like OS
       if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.stack
         key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.extra-suffix }}
     - name: Cache dependencies on Windows
       if: startsWith(runner.os, 'Windows')
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~\AppData\Roaming\stack

diff --git a/.hlint-test.yaml b/.hlint-test.yaml
@@ -12,7 +12,7 @@
     - DuplicateRecordFields
     - NoFieldSelectors
     - OverloadedLists
-      # Provided from GHC 9.2.1 (base-4.16.0.0):
+    # Provided from GHC 9.2.1 (base-4.16.0.0):
     - OverloadedRecordDot
     - OverloadedStrings
     - QuasiQuotes

diff --git a/.hlint.yaml b/.hlint.yaml
@@ -72,7 +72,7 @@
     - MultiWayIf
     - NoFieldSelectors
     - OverloadedLists
-      # Provided from GHC 9.2.1 (base-4.16.0.0):
+    # Provided from GHC 9.2.1 (base-4.16.0.0):
     - OverloadedRecordDot
     - OverloadedStrings
     - QuasiQuotes

diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs
@@ -524,7 +524,7 @@ generateHpcMarkupIndex = do
   let outputFile = outputDir </> relFileIndexHtml
   ensureDir outputDir
   (dirs, _) <- listDir outputDir
-  rows <- fmap (catMaybes . concat) $ forM dirs $ \dir -> do
+  rows <- fmap (concatMap catMaybes) $ forM dirs $ \dir -> do
     (subdirs, _) <- listDir dir
     forM subdirs $ \subdir -> do
       let indexPath = subdir </> relFileHpcIndexHtml

diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
@@ -621,7 +621,7 @@ writeMacrosFile ::
   -> [GhciPkgInfo]
   -> RIO env [String]
 writeMacrosFile outputDirectory pkgs = do
-  fps <- fmap (nubOrd . catMaybes . concat) $
+  fps <- fmap (nubOrd . concatMap catMaybes) $
     forM pkgs $ \pkg -> forM pkg.opts $ \(_, bio) -> do
       let cabalMacros = bio.cabalMacros
       exists <- liftIO $ doesFileExist cabalMacros

diff --git a/src/Stack/PackageFile.hs b/src/Stack/PackageFile.hs
@@ -83,7 +83,7 @@ resolveGlobFiles ::
   -> [String]
   -> RIO GetPackageFileContext (Set (Path Abs File))
 resolveGlobFiles cabalFileVersion =
-  fmap (S.fromList . catMaybes . concat) . mapM resolve
+  fmap (S.fromList . concatMap catMaybes) . mapM resolve
  where
   resolve name =
     if '*' `elem` name

diff --git a/src/Stack/Runners.hs b/src/Stack/Runners.hs
@@ -255,7 +255,7 @@ shouldUpgradeCheck = do
   config <- ask
   when config.recommendUpgrade $ do
     now <- getCurrentTime
-    let yesterday = addUTCTime (-24 * 60 * 60) now
+    let yesterday = addUTCTime (-(24 * 60 * 60)) now
     checks <- upgradeChecksSince yesterday
     when (checks == 0) $ do
       mversion <- getLatestHackageVersion NoRequireHackageIndex "stack" UsePreferredVersions