Skip to content
This repository has been archived by the owner on Jan 9, 2024. It is now read-only.

chore: Update to GHC 9.6.3 #30

Merged
merged 3 commits into from
Oct 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ jobs:
- uses: actions/checkout@v4

- name: Set up HLint
uses: haskell/actions/hlint-setup@v2
uses: haskell-actions/hlint-setup@v2
with:
version: 3.6.1

- name: Run HLint
uses: haskell/actions/hlint-run@v2
uses: haskell-actions/hlint-run@v2
with:
path: .
fail-on: warning
Expand All @@ -59,12 +59,12 @@ jobs:
- uses: actions/checkout@v4

- name: Install Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
with:
enable-stack: true
stack-setup-ghc: true
stack-version: latest
ghc-version: 9.6.2
ghc-version: 9.6.3

- name: Generate Cache Keys
id: cache-keys
Expand Down Expand Up @@ -170,12 +170,12 @@ jobs:
- uses: actions/checkout@v4

- name: Install Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
with:
enable-stack: true
stack-setup-ghc: true
stack-version: latest
ghc-version: 9.6.2
ghc-version: 9.6.3

- name: Restore Cache Stack Setup
uses: actions/cache/restore@v3
Expand Down Expand Up @@ -241,12 +241,12 @@ jobs:
- uses: actions/checkout@v4

- name: Install Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
with:
enable-stack: true
stack-setup-ghc: true
stack-version: latest
ghc-version: 9.6.2
ghc-version: 9.6.3

- name: Restore Cache Stack Setup
uses: actions/cache/restore@v3
Expand Down Expand Up @@ -334,12 +334,12 @@ jobs:
- uses: actions/checkout@v4

- name: Install Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
with:
enable-stack: true
stack-setup-ghc: true
stack-version: latest
ghc-version: 9.6.2
ghc-version: 9.6.3
cabal-version: latest

- name: Restore Cache Stack Setup
Expand Down
6 changes: 3 additions & 3 deletions package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ library:
- MCSP.Heuristics

dependencies:
- base >= 4.18 && < 5
- base >= 4.18.1 && < 5
- containers >= 0.6.7 && < 1
- deepseq >= 1.4.8.1 && < 2
- extra >= 1.7.14 && < 2
Expand Down Expand Up @@ -85,7 +85,7 @@ internal-libraries:
dependencies:
- mcsp-algorithms
- directory >= 1.3.8.1 && < 2
- filepath >= 1.4.100.1 && < 2
- filepath >= 1.4.100.4 && < 2
- MonadRandom >= 0.6 && < 1
- process >= 1.6.17 && < 2
- pcg-random >= 0.1.4 && < 1
Expand All @@ -105,7 +105,7 @@ tests:
- tasty-quickcheck >= 0.10.3 && < 1
# these dependencies are repeated here for Haskell Language Server to work in 'mcsp-test-lib'
- directory >= 1.3.8.1 && < 2
- filepath >= 1.4.100.1 && < 2
- filepath >= 1.4.100.4 && < 2
- MonadRandom >= 0.6 && < 1
- process >= 1.6.17 && < 2
- pcg-random >= 0.1.4 && < 1
Expand Down
8 changes: 5 additions & 3 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
#
# resolver: ./custom-snapshot.yaml
# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: nightly-2023-09-25
#
# See https://github.com/commercialhaskell/stackage-snapshots/tree/master/nightly
resolver: nightly-2023-10-01

# User packages to be built.
# Various formats can be used as shown in the example below.
Expand All @@ -28,6 +30,7 @@ resolver: nightly-2023-09-25
# - wai
packages:
- .

# Dependency packages to be pulled from upstream that are not in the resolver.
# These entries can reference officially published versions as well as
# forks / in-progress versions pinned to a git hash. For example:
Expand All @@ -52,8 +55,7 @@ extra-deps:
# system-ghc: true

# Require a specific version of Stack, using version ranges
# require-stack-version: -any # Default
require-stack-version: ">= 2.11"
require-stack-version: ">= 2.13"

# Override the architecture used by Stack, especially useful on Windows
# arch: i386
Expand Down
12 changes: 6 additions & 6 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ packages:
original:
hackage: doctest-0.22.1
- completed:
hackage: tasty-1.5@sha256:c62c96da1e9d65bf61ce583e9f7085eed1daeb62a45f3106ca252bf9ef87025b,2763
hackage: tasty-1.5@sha256:2dc91101339814be9913846ca8c424d1c3eccfefb27c6335f3fea2af40a3d2e4,2870
pantry-tree:
sha256: 7e9f57606982a8414be1a48a3fe16a29f2923b0f87c265a6ce0ab74944059d95
sha256: 0a7c186a9aab2f01a3bcdfad12f107e07ca2c414e93266d883ec770616f79448
size: 1944
original:
hackage: tasty-1.5
Expand All @@ -27,7 +27,7 @@ packages:
hackage: tasty-quickcheck-0.10.3
snapshots:
- completed:
sha256: 682574fdbde29718a8c5bc4a16e534b2e7c821922bdb46c1daf8adf373b28e55
size: 669535
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/9/25.yaml
original: nightly-2023-09-25
sha256: 5263c5cd05907ff6625e22009db2774a9d7d88fc713d8e41619b284a132f5923
size: 675308
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2023/10/1.yaml
original: nightly-2023-10-01