Skip to content

Commit

Permalink
Bump CI for GHC 9.6.5 and other matters
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilgrem committed May 6, 2024
1 parent 4abaf17 commit 4d20a35
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 34 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
- master
workflow_dispatch:

# As of 23 March 2024, ubuntu-latest, windows-latest and macos-latest come
# with Stack 2.13.3. However, macos-14 does not come with Haskell tools.
# As of 6 May 2024, ubuntu-latest and windows-latest come with Stack 2.15.5.
# However, macos-13 and macos-latest do not come with Haskell tools.

jobs:
build:
Expand All @@ -21,13 +21,13 @@ jobs:
- ubuntu-latest
snapshot:
- stack-ghc-9.4.8.yaml
- stack-ghc-9.6.4.yaml
- stack-ghc-9.6.5.yaml
- stack-ghc-9.8.2.yaml
include:
- os: macos-latest
- os: macos-13
snapshot: stack-ghc-9.8.2.yaml
# macos-14 provides macOS/AArch64 (M1)
- os: macos-14
# macos-latest provides macOS/AArch64 (M1)
- os: macos-latest
snapshot: stack-ghc-9.8.2.yaml
- os: windows-latest
snapshot: stack-ghc-9.8.2.yaml
Expand All @@ -53,9 +53,9 @@ jobs:
run: |
set -ex
if [[ "${{ matrix.os }}" == "macos-14" ]]
if [[ "${{ matrix.os }}" == "macos-13" || "${{ matrix.os }}" == "macos-latest" ]]
then
# macos-14 does not include Haskell tools as at 2024-03-23.
# macos-13 and macos-latest do not include Haskell tools as at 2024-05-06.
curl -sSL https://get.haskellstack.org/ | sh
fi
Expand Down
2 changes: 0 additions & 2 deletions stack-ghc-9.2.8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,3 @@ packages:
flags:
ansi-terminal:
win32-2-13-1: false
mintty:
win32-2-13-1: false
8 changes: 0 additions & 8 deletions stack-ghc-9.4.8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,3 @@ packages:
- tar-conduit-0.4.1@sha256:112d28118eb71901ea9e224e1b174c648b378256729669c2739b8b803d25b43a,3126
# crypton-connection-0.3.1 requires tls >= 1.7. lts-21.25 provides tls-1.6.0
- tls-1.8.0@sha256:0ea435fb1969384c76e6b6ba49c509cec55eec29f60dd2c335151d9c8a4e8b4f,5571

flags:
ansi-terminal:
win32-2-13-1: false
hackage-security:
cabal-syntax: true
mintty:
win32-2-13-1: false
6 changes: 0 additions & 6 deletions stack-ghc-9.6.4.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions stack-ghc-9.6.5.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Snapshot specification for GHC 9.6.5.
snapshot: lts-22.21 # GHC 9.6.5
6 changes: 1 addition & 5 deletions stack-ghc-9.8.2.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
# Snapshot specification for GHC 9.8.2.
snapshot: nightly-2024-03-20 # GHC 9.8.2

flags:
hackage-security:
cabal-syntax: true
snapshot: nightly-2024-05-06 # GHC 9.8.2
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
snapshot: stack-ghc-9.6.4.yaml
snapshot: stack-ghc-9.6.5.yaml
8 changes: 4 additions & 4 deletions stack.yaml.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4d20a35

Please sign in to comment.