Skip to content

Commit

Permalink
Merge pull request #145 from malob/update-ghc
Browse files Browse the repository at this point in the history
Update to GHC 9.6.4
  • Loading branch information
isovector authored Mar 26, 2024
2 parents 9d83faa + 5500298 commit 54b417d
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/template/stack-cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ runs:
fi
- name: Cache ${{ env.global_stack_dir }}
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.global_stack_dir }}
key: ${{ runner.os }}-stack-global-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}${{ env.unique_suffix }}
Expand All @@ -41,7 +41,7 @@ runs:
${{ runner.os }}-stack-global-
- name: Cache ${{ inputs.stack-work-dir }}
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ inputs.stack-work-dir }}
key: ${{ runner.os }}-stack-work-${{ hashFiles('stack.yaml') }}-${{ hashFiles('package.yaml') }}-${{ hashFiles('**/*.hs') }}${{ env.unique_suffix }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nix-agda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v26
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: Cache Nix builds
uses: DeterminateSystems/magic-nix-cache-action@v2
uses: DeterminateSystems/magic-nix-cache-action@v4

- name: Build Agda
run: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v26
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: Cache Nix builds
uses: DeterminateSystems/magic-nix-cache-action@v2
uses: DeterminateSystems/magic-nix-cache-action@v4

- name: Build cornelis
run: |
Expand All @@ -41,10 +41,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v26
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

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

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Cache Stack dirs (Linux/macOS)
if: runner.os != 'Windows'
Expand All @@ -60,7 +60,7 @@ jobs:
# and also reduces how much we need to cache with the `cache` action.
- name: Install Nix
if: runner.os != 'Windows'
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v26
with:
extra_nix_config: |
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
Expand All @@ -86,7 +86,7 @@ jobs:
# Tests can be flaky so we retry them a few times.
- name: Run tests
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
with:
timeout_minutes: 20
max_attempts: 3
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

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

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
name = "cornelis";
# Update `./.github/workflows/nix.yml` if changed.
# `ghc902` excluded due to build issues.
ghcVersions = map (v: "ghc${v}") [ "810" "92" "94" "96" ];
ghcVersions = map (v: "ghc${v}") [ "810" "92" "94" "96" "98" ];
# Ensure resolver in `./stack.yaml` is in sync with `defaultGhcVersion`.
defaultGhcVersion = "ghc94";
defaultGhcVersion = "ghc96";
in
{
overlays = {
Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# GHC 9.4.8
# GHC 9.6.4
# Update `defaultGHCVersion` in `./flake.nix` when updating to resolver with different GHC version.
resolver: lts-21.25
resolver: lts-22.13

packages:
- .
Expand Down
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ packages:
hackage: levenshtein-0.2.1.0
snapshots:
- completed:
sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd
size: 640086
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml
original: lts-21.25
sha256: 6f0bea3ba5b07360f25bc886e8cff8d847767557a492a6f7f6dcb06e3cc79ee9
size: 712905
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/13.yaml
original: lts-22.13

0 comments on commit 54b417d

Please sign in to comment.