From c28b4066af2c9f9c08240239d18839cd08dc47e6 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 25 Mar 2024 11:31:49 -0700 Subject: [PATCH 1/2] Update to GHC 9.6.4 --- flake.lock | 12 ++++++------ flake.nix | 4 ++-- stack.yaml | 4 ++-- stack.yaml.lock | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index ddcfe46..5fbc7f0 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702938738, - "narHash": "sha256-O7Vb0xC9s4Dmgxj8APEpuuMj7HsLgPbpy1UKvNVJp7o=", + "lastModified": 1711231723, + "narHash": "sha256-dARJQ8AJOv6U+sdRePkbcVyVbXJTi1tReCrkkOeusiA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd8e82f3b4017b8faa52c2b1897a38d53c3c26cb", + "rev": "e1d501922fd7351da4200e1275dfcf5faaad1220", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d2ddc8b..bb7d281 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = { diff --git a/stack.yaml b/stack.yaml index 0092c41..0374b81 100644 --- a/stack.yaml +++ b/stack.yaml @@ -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: - . diff --git a/stack.yaml.lock b/stack.yaml.lock index 072ec43..716c745 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -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 From 5500298cb7ab85b6635d7bc02fff91fa71ba8309 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 25 Mar 2024 11:38:20 -0700 Subject: [PATCH 2/2] Update to latest version of GitHub actions used --- .github/template/stack-cache/action.yml | 4 ++-- .github/workflows/nix-agda.yml | 6 +++--- .github/workflows/nix.yml | 10 +++++----- .github/workflows/stack.yml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/template/stack-cache/action.yml b/.github/template/stack-cache/action.yml index 6a28955..6ed68d8 100644 --- a/.github/template/stack-cache/action.yml +++ b/.github/template/stack-cache/action.yml @@ -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 }} @@ -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 }} diff --git a/.github/workflows/nix-agda.yml b/.github/workflows/nix-agda.yml index 3e6dee4..575131f 100644 --- a/.github/workflows/nix-agda.yml +++ b/.github/workflows/nix-agda.yml @@ -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: | diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index b5850a3..85ddec3 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -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: | @@ -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 }} diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index a64d28c..799cf51 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -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' @@ -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' @@ -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 }} @@ -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