From 0a202fea9d1d30d0e4624174114b7ff925b1366f Mon Sep 17 00:00:00 2001 From: "Sam A. Horvath-Hunt" Date: Wed, 24 Apr 2024 17:46:01 +0100 Subject: [PATCH] Bump actions The updated Haskell publish setup action should hopefully resolve GHC being installed in x86_64 despite running in an aarch64 environment. --- .github/actions/cabal-cache/action.yml | 4 ++-- .github/workflows/check.yml | 26 +++++++++++++------------- .github/workflows/publish.yml | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/actions/cabal-cache/action.yml b/.github/actions/cabal-cache/action.yml index 207e049..9bbb41a 100644 --- a/.github/actions/cabal-cache/action.yml +++ b/.github/actions/cabal-cache/action.yml @@ -3,14 +3,14 @@ runs: using: composite steps: - name: Cache dependencies - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.local/state/cabal/store/ key: cabal-${{ runner.os }}-${{ hashFiles('cabal.project.freeze') }} restore-keys: | cabal-${{ runner.os }} - name: Cache incremental build - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ./dist-newstyle/ key: dist-${{ runner.os }}-${{ github.sha }} diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ba4d662..7ac4940 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -11,15 +11,15 @@ jobs: name: Validate Nix runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v26 - run: nix flake check build: name: Build runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v26 - run: nix develop -c cabal update - run: nix develop -c cabal freeze - uses: ./.github/actions/cabal-cache @@ -28,8 +28,8 @@ jobs: name: Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v26 - run: nix develop -c cabal update - run: nix develop -c cabal freeze - uses: ./.github/actions/cabal-cache @@ -38,15 +38,15 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v26 - run: nix develop -c hlint lib cli test fmt: name: Formatting runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v26 # stylish-haskell doesn't have a check/dry run option, so we'll run it # against files in place and test if there are any diffs with Git. - run: | @@ -59,9 +59,9 @@ jobs: run: working-directory: .golden/ts/ steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 - - uses: actions/cache@v3 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v26 + - uses: actions/cache@v4 with: path: ~/.cache/yarn/v6 key: yarn-${{ runner.os }}-${{ hashFiles('.golden/ts/yarn.lock') }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index af969b3..a64837c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,11 +20,11 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Using Nix causes dynamic linking issues on macOS. It's easier to # workaround on Linux with patchelf at least. (Yes, building statically # would be substantially better.) - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 with: ghc-version: 9.4.6 - run: cabal freeze @@ -38,7 +38,7 @@ jobs: cabal build mv $(find ./dist-newstyle/ -name intlc -type f) dist-newstyle/intlc-${{ github.ref_name }}-${{ matrix.os.name }} - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: | dist-newstyle/intlc-${{ github.ref_name }}-${{ matrix.os.name }}