Skip to content

Commit 851291e

Browse files
authored
Upgrade to GHC 9.2.8 (purescript#4537)
* Update resolver to lts-20.26 * Update haskell/action to haskell-action
1 parent debfc2e commit 851291e

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ defaults:
3232
env:
3333
CI_PRERELEASE: "${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}"
3434
CI_RELEASE: "${{ github.event_name == 'release' }}"
35-
STACK_VERSION: "2.9.3"
35+
STACK_VERSION: "2.15.1"
3636

3737
concurrency:
3838
# We never want two prereleases building at the same time, since they would
@@ -55,7 +55,7 @@ jobs:
5555
include:
5656
- # If upgrading the Haskell image, also upgrade it in the lint job below
5757
os: ["ubuntu-latest"]
58-
image: haskell:9.2.5@sha256:2597b0e2458165a6635906204f7fac43c22e7d2a46aca1235a811194bb6cd419
58+
image: haskell:9.2.8@sha256:b3b2f3909c7381bb96b8f18766f9407a3d6f61e0f07ea95e812583ac4f442cbb
5959
- os: ["macOS-11"]
6060
- os: ["windows-2019"]
6161
- os: ["self-hosted", "macos", "ARM64"]
@@ -99,7 +99,7 @@ jobs:
9999
# and their Haskell environment is instead provided by a nix-shell
100100
# See https://github.com/purescript/purescript/pulls/4455
101101
if: "!contains(matrix.os, 'ubuntu-latest') && !contains(matrix.os, 'self-hosted')"
102-
uses: "haskell/actions/setup@v1"
102+
uses: "haskell-actions/setup@v2"
103103
with:
104104
enable-stack: true
105105
stack-version: "${{ env.STACK_VERSION }}"
@@ -231,7 +231,7 @@ jobs:
231231
# means our published binaries will work on the widest number of platforms.
232232
# But the HLint binary downloaded by this job requires a newer glibc
233233
# version.
234-
container: haskell:9.2.5@sha256:2597b0e2458165a6635906204f7fac43c22e7d2a46aca1235a811194bb6cd419
234+
container: haskell:9.2.8@sha256:b3b2f3909c7381bb96b8f18766f9407a3d6f61e0f07ea95e812583ac4f442cbb
235235

236236
steps:
237237
- # We need a proper Git repository, but the checkout step will unpack a tarball instead of doing a clone

CHANGELOG.d/misc_ghc-bump.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* Update Stackage snapshot to lts-20.26 and GHC to 9.2.8

INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ If you are having difficulty installing the PureScript compiler, feel free to as
44

55
## Requirements
66

7-
The PureScript compiler is built using GHC 9.2.5, and should be able to run on any operating system supported by GHC 9.2.5. In particular:
7+
The PureScript compiler is built using GHC 9.2.8, and should be able to run on any operating system supported by GHC 9.2.8. In particular:
88

99
* for Windows users, versions predating Vista are not officially supported,
1010
* for macOS / OS X users, versions predating Mac OS X 10.7 (Lion) are not officially supported.
1111

12-
See also <https://www.haskell.org/ghc/download_ghc_9_2_5.html> for more details about the operating systems which GHC 9.2.5 supports.
12+
See also <https://www.haskell.org/ghc/download_ghc_9_2_8.html> for more details about the operating systems which GHC 9.2.8 supports.
1313

1414
## Official prebuilt binaries
1515

purescript.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ common defaults
119119
TypeFamilies
120120
ViewPatterns
121121
build-tool-depends:
122-
happy:happy ==1.20.0
122+
happy:happy ==1.20.1.1
123123
build-depends:
124124
-- NOTE: Please do not edit these version constraints manually. They are
125125
-- deliberately made narrow because changing the dependency versions in

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Please update Haskell image versions under .github/workflows/ci.yml together to use the same GHC version
22
# (or the CI build will fail)
3-
resolver: lts-20.9
3+
resolver: lts-20.26
44
pvp-bounds: both
55
packages:
66
- '.'

0 commit comments

Comments
 (0)