Merge pull request #5763 from commercialhaskell/ghc-922

Add support for GHC 9.2.4 and its Cabal-3.6.3.0

Author: mpilgrem

.github/workflows/arm64-release.yml

@@ -1,4 +1,4 @@
-name: ARM64 Release
+name: ARM64 (AArch64) Release
 
 on:
   pull_request:
@@ -17,18 +17,18 @@ jobs:
     runs-on: [self-hosted, linux, ARM64]
     steps:
     - name: Clone project
-      uses: actions/checkout@v2
-    - shell: bash
+      uses: actions/checkout@v3
+    - name: Build bindist
+      shell: bash
       run: |
         set -ex
-
         docker build . -f etc/dockerfiles/arm64.Dockerfile -t stack --build-arg USERID=$(id -u) --build-arg GROUPID=$(id -g)
         rm -rf _release
         mkdir -p _release
         docker run --rm -v $(pwd):/src -w /src stack bash -c "/home/stack/release build"
 
     - name: Upload bindist
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Linux-ARM64
         path: _release/stack-*

.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,52 +28,55 @@ jobs:
           cache-bust: ""
         - os: windows-latest
           release-args: ""
-          cache-bust: ""
+          cache-bust: "13"
         - os: macos-latest
           release-args: ""
-          cache-bust: "1"
+          cache-bust: "23"
     steps:
     - name: Clone project
-      uses: actions/checkout@v2
+      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 }}
-    - shell: bash
-      name: Install deps and run checks
+        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
           #   Fatal error: glibc detected an invalid stdio handle
           # See:
           #   https://github.com/nh2/static-haskell-nix/pull/27#issuecomment-502652181
           #   https://github.com/NixOS/nix/issues/2733
-          (for i in {1..5}; do bash <(curl -sSL https://nixos.org/nix/install) && exit 0; done; exit 1)
+          (for i in {1..5}; do bash <(curl -sSL https://nixos.org/nix/install) --no-daemon && exit 0; done; exit 1)
           . ~/.nix-profile/etc/profile.d/nix.sh
-          nix-channel --add https://nixos.org/channels/nixos-19.09 nixpkgs
+          nix-channel --add https://nixos.org/channels/nixos-22.05 nixpkgs
           nix-channel --update # Get GHC 8.2.2
-        elif [[ "${{ matrix.os }}" == "windows-latest" ]]
+        fi
+
+        if [[ "${{ matrix.release-args }}" == "--alpine" ]]
         then
-          choco install nsis-unicode -y
+            touch ~/.stack/config.yaml
+            cat > ~/.stack/config.yaml <<EOF
+            extra-include-dirs:
+            - /usr/include
+            extra-lib-dirs:
+            - /lib
+            - /usr/lib
+        EOF
         fi
 
         # Do this in the same step as installing deps to get relevant env var modifications
@@ -84,7 +89,7 @@ jobs:
       run: stack etc/scripts/release.hs build ${{ matrix.release-args }}
 
     - name: Upload bindist
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: ${{ runner.os }}
         path: _release/stack-*
@@ -96,17 +101,17 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     steps:
     - name: Download Linux artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: Linux
         path: _release
     - name: Download macOS artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: macOS
         path: _release
     - name: Download Windows artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: Windows
         path: _release

.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,44 +43,49 @@ 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.yaml
+          stack-yaml: stack-macos.yaml
           extra-suffix: ""
           stack-args: ""
     steps:
     - name: Clone project
-      uses: actions/checkout@v2
+      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 }}
+        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 }}
-    - shell: bash
+        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
-        stack test ${{ matrix.stack-args }} --haddock --no-haddock-deps --ghc-options="-Werror" --copy-bins --local-bin-path bin
+
+        if [[ "${{ matrix.extra-suffix }}" == "alpine" ]]
+        then
+            touch ~/.stack/config.yaml
+            cat > ~/.stack/config.yaml <<EOF
+            extra-include-dirs:
+            - /usr/include
+            extra-lib-dirs:
+            - /lib
+            - /usr/lib
+        EOF
+        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
         if [[ "${{ matrix.os }}" == "macos-latest" ]]

etc/scripts/build-stack-installer.hs

@@ -1,5 +1,5 @@
 {- stack script
-    --resolver lts-14.27
+    --resolver nightly-2022-08-02
     --install-ghc
     --package nsis
 -}

etc/scripts/release.hs

@@ -1,44 +1,23 @@
 {- stack script
-    --resolver lts-14.27
-    --install-ghc
+    --resolver nightly-2022-08-02
+    --extra-dep Cabal-3.6.3.0
     --ghc-options -Wall
-    --package Cabal
-    --package aeson
-    --package bytestring
-    --package case-insensitive
-    --package conduit
-    --package conduit-combinators
-    --package cryptohash
-    --package directory
-    --package extra
-    --package http-conduit
-    --package http-types
-    --package mime-types
-    --package process
-    --package resourcet
-    --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
@@ -49,16 +28,11 @@ import qualified Codec.Archive.Tar as Tar
 import qualified Codec.Archive.Tar.Entry as TarEntry
 import qualified Codec.Archive.Zip as Zip
 import qualified Codec.Compression.GZip as GZip
-import Data.List.Extra
 import Development.Shake
 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 =
@@ -79,12 +53,16 @@ main =
             gHomeDir <- getHomeDirectory
 
             let gAllowDirty = False
+                platformArgs :: [String]
+                platformArgs = if Info.os == "darwin"
+                               then ["--stack-yaml", "stack-macos.yaml"]
+                               else []
                 Platform arch _ = buildPlatform
                 gArch = arch
                 gBinarySuffix = ""
                 gTestHaddocks = True
                 gProjectRoot = "" -- Set to real value velow.
-                gBuildArgs = ["--flag", "stack:-developer-mode"]
+                gBuildArgs = platformArgs <> ["--flag", "stack:-developer-mode"]
                 gStaticLinux = False
                 gCertificateName = Nothing
                 global0 = foldl (flip id) Global{..} flags
@@ -185,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
@@ -249,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]
 
@@ -419,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

src/Stack/Build/Execute.hs

@@ -294,7 +294,7 @@ getSetupExe setupHs setupShimHs tmpdir = do
                     , toFilePath tmpOutputPath
                     ]
             compilerPath <- getCompilerPath
-            withWorkingDir (toFilePath tmpdir) (proc (toFilePath compilerPath) args $ \pc0 -> do
+            withWorkingDir (toFilePath tmpdir) $ proc (toFilePath compilerPath) args (\pc0 -> do
               let pc = setStdout (useHandleOpen stderr) pc0
               runProcess_ pc)
                 `catch` \ece ->

src/Stack/PackageDump.hs

@@ -64,7 +64,8 @@ ghcPkgCmdArgs pkgexe@(GhcPkgExe pkgPath) cmd mpkgDbs sink = do
     case reverse mpkgDbs of
         (pkgDb:_) -> createDatabase pkgexe pkgDb -- TODO maybe use some retry logic instead?
         _ -> return ()
-    sinkProcessStdout (toFilePath pkgPath) args sink'
+    -- https://github.com/haskell/process/issues/251
+    snd <$> sinkProcessStderrStdout (toFilePath pkgPath) args CL.sinkNull sink'
   where
     args = concat
         [ case mpkgDbs of