add back import Data.List.Extra

Trim packages from release.hs

Author: psibi

.github/workflows/integration-tests.yml

@@ -9,10 +9,12 @@ on:
     - rc/**
     tags:
     - '**'
-  schedule:
-  - cron: "0 0 * * *"
   workflow_dispatch:
 
+# As of 11 August 2022, ubuntu-latest, windows-latest and macos-latest come with
+# Stack 2.7.5. windows-latest comes with NSIS 3.08, for which the default value
+# of the 'Unicode' installer attribute is 'true'.
+
 jobs:
   integration-tests:
     name: Integration tests
@@ -26,29 +28,32 @@ jobs:
           cache-bust: ""
         - os: windows-latest
           release-args: ""
-          cache-bust: "12"
+          cache-bust: "13"
         - os: macos-latest
           release-args: ""
           cache-bust: "23"
     steps:
     - name: Clone project
-      uses: actions/checkout@v2
-    - name: Cache dependencies
-      uses: actions/cache@v1
+      uses: actions/checkout@v3
+    - name: Cache dependencies on Unix-like OS
+      if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
+      uses: actions/cache@v3
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}${{ matrix.cache-bust }}
+        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.cache-bust }}
+    - name: Cache dependencies on Windows
+      if: startsWith(runner.os, 'Windows')
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~\AppData\Roaming\stack
+          ~\AppData\Local\Programs\stack
+        key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ matrix.cache-bust }}
     - name: Install deps and run checks
       shell: bash
       run: |
         set -ex
 
-        # Work around 'git status' always showing symlinks modified on Windows; see
-        # https://github.com/git-for-windows/git/issues/2653#issuecomment-640234081
-        git config --global core.fscache false
-
-        stack upgrade || curl -sSL https://get.haskellstack.org/ | sh -s - -f
-
         if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]
         then
           # Retry installing nix due to nondeterministic error
@@ -60,9 +65,6 @@ jobs:
           . ~/.nix-profile/etc/profile.d/nix.sh
           nix-channel --add https://nixos.org/channels/nixos-22.05 nixpkgs
           nix-channel --update # Get GHC 8.2.2
-        elif [[ "${{ matrix.os }}" == "windows-latest" ]]
-        then
-          choco install nsis-unicode -y
         fi
 
         if [[ "${{ matrix.release-args }}" == "--alpine" ]]

.github/workflows/lint.yml

@@ -3,6 +3,10 @@ name: Linting
 on:
   pull_request:
   push:
+    branches:
+    - master
+    - stable
+    - rc/**
 
 jobs:
   style:

.github/workflows/stan.yml

@@ -1,8 +1,12 @@
 name: stan
 
 on:
-  push:
   pull_request:
+  push:
+    branches:
+    - master
+    - stable
+    - rc/**
 
 jobs:
   build:

.github/workflows/unit-tests.yml

@@ -9,6 +9,9 @@ on:
     - rc/**
   workflow_dispatch:
 
+# As of 11 August 2022, ubuntu-latest, windows-latest and macos-latest come with
+# Stack 2.7.5. ubuntu-latest comes with GHC 9.2.4.
+
 jobs:
   pedantic:
     name: Pedantic
@@ -17,7 +20,7 @@ jobs:
     - name: Clone project
       uses: actions/checkout@v3
     - name: Cache dependencies
-      uses: actions/cache@v1
+      uses: actions/cache@v3
       with:
         path: ~/.stack
         key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}
@@ -40,34 +43,35 @@ jobs:
           stack-yaml: stack.yaml
           extra-suffix: "alpine"
           stack-args: "--docker --system-ghc --no-install-ghc --flag stack:static"
-        - os: ubuntu-latest
-          stack-yaml: stack-ghc-902.yaml
-          extra-suffix: ""
-          stack-args: ""
         - os: windows-latest
           stack-yaml: stack.yaml
           extra-suffix: ""
           stack-args: ""
-        - os: windows-latest
-          stack-yaml: stack-ghc-902.yaml
-          extra-suffix: ""
-          stack-args: ""
         - os: macos-latest
           stack-yaml: stack-macos.yaml
           extra-suffix: ""
           stack-args: ""
     steps:
     - name: Clone project
-      uses: actions/checkout@v2
-    - name: Cache dependencies
-      uses: actions/cache@v1
+      uses: actions/checkout@v3
+    - name: Cache dependencies on Unix-like OS
+      if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
+      uses: actions/cache@v3
       with:
         path: ~/.stack
-        key: ${{ runner.os }}-${{ hashFiles( matrix.stack-yaml ) }}-${{ matrix.extra-suffix }}
-    - shell: bash
+        key: ${{ runner.os }}-${{ hashFiles(matrix.stack-yaml) }}-${{ matrix.extra-suffix }}
+    - name: Cache dependencies on Windows
+      if: startsWith(runner.os, 'Windows')
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~\AppData\Roaming\stack
+          ~\AppData\Local\Programs\stack
+        key: ${{ runner.os }}-${{ hashFiles(matrix.stack-yaml) }}-${{ matrix.extra-suffix }}
+    - name: Run tests
+      shell: bash
       run: |
         set -ex
-        stack upgrade || curl -sSL https://get.haskellstack.org/ | sh -s - -f
 
         if [[ "${{ matrix.extra-suffix }}" == "alpine" ]]
         then
@@ -81,11 +85,6 @@ jobs:
         EOF
         fi
 
-        if [[ "${{ matrix.os }}" == "windows-latest" ]]
-        then
-            stack exec pacman -- --sync --refresh --noconfirm autoconf
-        fi
-
         stack test ${{ matrix.stack-args }} --stack-yaml ${{ matrix.stack-yaml }} --haddock --no-haddock-deps --ghc-options="-Werror -O0" --copy-bins --local-bin-path bin
 
         # Get output about whether the exe is dynamically linked

etc/scripts/release.hs

@@ -1,37 +1,23 @@
 {- stack script
     --resolver nightly-2022-08-02
-    --system-ghc
+    --extra-dep Cabal-3.6.3.0
     --ghc-options -Wall
-    --package Cabal
-    --package aeson
-    --package bytestring
-    --package extra
-    --package directory
-    --package http-types
-    --package process
-    --package shake
-    --package tar
-    --package text
-    --package zip-archive
-    --package zlib
 -}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE RecordWildCards #-}
 
 import Control.Applicative
 import Control.Exception
 import Control.Monad
 import qualified Data.ByteString.Lazy.Char8 as L8
 import Data.List
+import Data.List.Extra
 import Data.Maybe
 import Distribution.PackageDescription.Parsec
 import Distribution.Text
 import Distribution.System
 import Distribution.Package
 import Distribution.PackageDescription hiding (options)
-#if MIN_VERSION_Cabal(3, 0, 0)
 import Distribution.Utils.ShortText (fromShortText)
-#endif
 import Distribution.Verbosity
 import System.Console.GetOpt
 import System.Directory
@@ -47,11 +33,6 @@ import Development.Shake.FilePath
 import qualified System.Info as Info
 import Prelude -- Silence AMP warning
 
-#if !MIN_VERSION_Cabal(3, 0, 0)
-fromShortText :: String -> String
-fromShortText = id
-#endif
-
 -- | Entrypoint.
 main :: IO ()
 main =
@@ -182,11 +163,7 @@ rules global@Global{..} args = do
             entries <- forM stageFiles $ \stageFile -> do
                 Zip.readEntry
                     [Zip.OptLocation
-#if MIN_VERSION_zip_archive(0,3,0)
                         (dropFileName (dropDirectoryPrefix (releaseStageDir </> binaryName) stageFile))
-#else
-                        (dropDirectoryPrefix (releaseStageDir </> binaryName) stageFile)
-#endif
                         False]
                     stageFile
             let archive = foldr Zip.addEntryToArchive Zip.emptyArchive entries
@@ -246,7 +223,7 @@ rules global@Global{..} args = do
         need [releaseDir </> binaryExeFileName]
         need [releaseDir </> binaryInstallerNSIFileName]
 
-        command_ [Cwd releaseDir] "c:\\Program Files (x86)\\NSIS\\Unicode\\makensis.exe"
+        command_ [Cwd releaseDir] "makensis.exe"
             [ "-V3"
             , binaryInstallerNSIFileName]
 
@@ -416,12 +393,6 @@ stackArgs Global{..} = ["--arch=" ++ display gArch, "--interleaved-output"]
 stackProgName :: FilePath
 stackProgName = "stack"
 
--- | Linux distribution/version combination.
-data DistroVersion = DistroVersion
-    { dvDistro :: !String
-    , dvVersion :: !String
-    , dvCodeName :: !String }
-
 -- | Global values and options.
 data Global = Global
     { gStackPackageDescription :: !PackageDescription

stack.yaml

@@ -4,6 +4,10 @@ resolver: nightly-2022-08-02
 packages:
 - .
 
+drop-packages:
+# See https://github.com/commercialhaskell/stack/pull/4712
+- cabal-install
+
 docker:
   enable: false
   repo: psibi/alpine-haskell-stack:9.2.4
@@ -21,10 +25,6 @@ flags:
 ghc-options:
   "$locals": -fhide-source-paths
 
-drop-packages:
-# See https://github.com/commercialhaskell/stack/pull/4712
-- cabal-install
-
 user-message: |
   If building Stack on macOS, you are advised to use stack-macos.yaml as the
   project-level configuration file, and command: