Skip to content

Commit 54b417d

Browse files
authored
Merge pull request #145 from malob/update-ghc
Update to GHC 9.6.4
2 parents 9d83faa + 5500298 commit 54b417d

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

.github/template/stack-cache/action.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
fi
3232
3333
- name: Cache ${{ env.global_stack_dir }}
34-
uses: actions/cache@v3
34+
uses: actions/cache@v4
3535
with:
3636
path: ${{ env.global_stack_dir }}
3737
key: ${{ runner.os }}-stack-global-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}${{ env.unique_suffix }}
@@ -41,7 +41,7 @@ runs:
4141
${{ runner.os }}-stack-global-
4242
4343
- name: Cache ${{ inputs.stack-work-dir }}
44-
uses: actions/cache@v3
44+
uses: actions/cache@v4
4545
with:
4646
path: ${{ inputs.stack-work-dir }}
4747
key: ${{ runner.os }}-stack-work-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}-${{ hashFiles('**/*.hs') }}${{ env.unique_suffix }}

.github/workflows/nix-agda.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323

2424
steps:
2525
- name: Checkout repo
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Install Nix
29-
uses: cachix/install-nix-action@v22
29+
uses: cachix/install-nix-action@v26
3030
with:
3131
extra_nix_config: |
3232
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
3333
3434
- name: Cache Nix builds
35-
uses: DeterminateSystems/magic-nix-cache-action@v2
35+
uses: DeterminateSystems/magic-nix-cache-action@v4
3636

3737
- name: Build Agda
3838
run: |

.github/workflows/nix.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repo
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Install Nix
26-
uses: cachix/install-nix-action@v22
26+
uses: cachix/install-nix-action@v26
2727
with:
2828
extra_nix_config: |
2929
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
3030
3131
- name: Cache Nix builds
32-
uses: DeterminateSystems/magic-nix-cache-action@v2
32+
uses: DeterminateSystems/magic-nix-cache-action@v4
3333

3434
- name: Build cornelis
3535
run: |
@@ -41,10 +41,10 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repo
44-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
4545

4646
- name: Install Nix
47-
uses: cachix/install-nix-action@v22
47+
uses: cachix/install-nix-action@v26
4848
with:
4949
extra_nix_config: |
5050
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}

.github/workflows/stack.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- name: Checkout repo
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Cache Stack dirs (Linux/macOS)
2020
if: runner.os != 'Windows'
@@ -41,7 +41,7 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repo
44-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
4545

4646
- name: Cache Stack dirs (Linux/macOS)
4747
if: runner.os != 'Windows'
@@ -60,7 +60,7 @@ jobs:
6060
# and also reduces how much we need to cache with the `cache` action.
6161
- name: Install Nix
6262
if: runner.os != 'Windows'
63-
uses: cachix/install-nix-action@v22
63+
uses: cachix/install-nix-action@v26
6464
with:
6565
extra_nix_config: |
6666
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
@@ -86,7 +86,7 @@ jobs:
8686
8787
# Tests can be flaky so we retry them a few times.
8888
- name: Run tests
89-
uses: nick-fields/retry@v2
89+
uses: nick-fields/retry@v3
9090
with:
9191
timeout_minutes: 20
9292
max_attempts: 3

flake.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
name = "cornelis";
1313
# Update `./.github/workflows/nix.yml` if changed.
1414
# `ghc902` excluded due to build issues.
15-
ghcVersions = map (v: "ghc${v}") [ "810" "92" "94" "96" ];
15+
ghcVersions = map (v: "ghc${v}") [ "810" "92" "94" "96" "98" ];
1616
# Ensure resolver in `./stack.yaml` is in sync with `defaultGhcVersion`.
17-
defaultGhcVersion = "ghc94";
17+
defaultGhcVersion = "ghc96";
1818
in
1919
{
2020
overlays = {

stack.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# GHC 9.4.8
1+
# GHC 9.6.4
22
# Update `defaultGHCVersion` in `./flake.nix` when updating to resolver with different GHC version.
3-
resolver: lts-21.25
3+
resolver: lts-22.13
44

55
packages:
66
- .

stack.yaml.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packages:
1313
hackage: levenshtein-0.2.1.0
1414
snapshots:
1515
- completed:
16-
sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd
17-
size: 640086
18-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml
19-
original: lts-21.25
16+
sha256: 6f0bea3ba5b07360f25bc886e8cff8d847767557a492a6f7f6dcb06e3cc79ee9
17+
size: 712905
18+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/13.yaml
19+
original: lts-22.13

0 commit comments

Comments
 (0)