Skip to content

Commit

Permalink
Move GHC 9.2.5 -> 9.2.7; and trial 9.6.1-rc1
Browse files Browse the repository at this point in the history
- Update haskell.yml
- Update haskell-linux.yml
- Update stylish-haskell.yml
- Update github-page.yml
- Update haskell-linux.yml
- allow newer bytestring for protolude (GHC 9.2.5 -> GHC 9.2.7)
  • Loading branch information
angerman committed Mar 7, 2023
1 parent 3060c32 commit cb5acfa
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7"]
ghc: ["9.2.7"]
cabal: ["3.8.1.0"]
os: [ubuntu-latest]

Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/haskell-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.2.5"]
ghc: ["8.10.7", "9.2.7", "9.6.0.20230302"]
cabal: ["3.8.1.0"]
os: [ubuntu-latest]

Expand All @@ -36,6 +36,9 @@ jobs:
# https://github.com/actions/runner-images/issues/7061
run: sudo chown -R $USER /usr/local/.ghcup

- name: Add GHCUp Pre-release channel
run: ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml

- name: Install Haskell
uses: input-output-hk/setup-haskell@v1
id: setup-haskell
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.5"]
ghc: ["9.2.7"]
cabal: ["3.8.1.0"]
os: [macos-latest, windows-latest]

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stylish-haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
uses: input-output-hk/setup-haskell@v1
id: setup-haskell
with:
ghc-version: 9.2.5
ghc-version: 9.2.7
cabal-version: 3.8.1.0

- name: Cabal update
Expand Down
3 changes: 3 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,9 @@ allow-newer:
, libsystemd-journal:base
-- This is required for 9.2.
, katip:Win32
-- protolude has an upper bound on bytestring>=0.10 && <0.11.4
-- yet 0.11.4 is what 9.2.7 ships with.
, protolude:bytestring

-- IMPORTANT
-- Do NOT add more source-repository-package stanzas here unless they are strictly
Expand Down

0 comments on commit cb5acfa

Please sign in to comment.