Skip to content

Commit

Permalink
Fix workflows
Browse files Browse the repository at this point in the history
- Bump version of actions/cache used
- Bump version of actions/checkout used
- Trim trailing whitespace
  • Loading branch information
pbrisbin committed Feb 5, 2024
1 parent 4b7c98e commit 0630bc4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,20 @@ jobs:
runs-on: ${{ matrix.runner }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: stack
uses: ./
with:
working-directory: example
stack-arguments: --resolver ${{ matrix.stack.resolver }}
cache-prefix: ${{ matrix.stack.resolver }}/

- if: matrix.stack.ghc
shell: bash
run: |
[[ "${{ steps.stack.outputs.compiler }}" = ghc-${{ matrix.stack.ghc }} ]]
[[ "${{ steps.stack.outputs.compiler-version }}" = ${{ matrix.stack.ghc }} ]]
- shell: bash
run: |
# stack path | cut -d: -f1
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
test-generate:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: generate
uses: ./generate-matrix
with:
Expand All @@ -107,7 +107,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./
with:
working-directory: example
Expand All @@ -116,7 +116,7 @@ jobs:
test-auto-nightly:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: stack
uses: ./
with:
Expand All @@ -127,7 +127,7 @@ jobs:
test-auto-nightly-with-explicit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: stack
uses: ./
with:
Expand Down
8 changes: 4 additions & 4 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ runs:
- name: Restore dependencies cache
id: restore-deps
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: |
${{ steps.stack-path.outputs.stack-root }}
Expand Down Expand Up @@ -269,7 +269,7 @@ runs:
if: |
(success() && steps.restore-deps.outputs.cache-hit != 'true') ||
(!cancelled() && inputs.cache-save-always == 'true')
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: |
${{ steps.stack-path.outputs.stack-root }}
Expand All @@ -279,7 +279,7 @@ runs:

- name: Restore build cache
id: restore-build
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
path: ${{ steps.setup.outputs.stack-works }}
key: ${{ inputs.cache-prefix }}${{ runner.os }}-stack-build-${{ steps.setup.outputs.snapshot-hash }}-${{ steps.setup.outputs.package-hash }}-${{ steps.setup.outputs.sources-hash }}
Expand All @@ -302,7 +302,7 @@ runs:
if: |
(success() && steps.restore-build.outputs.cache-hit != 'true') ||
(!cancelled() && inputs.cache-save-always == 'true')
uses: actions/cache/save@v3
uses: actions/cache/save@v4
with:
path: ${{ steps.setup.outputs.stack-works }}
key: ${{ inputs.cache-prefix }}${{ runner.os }}-stack-build-${{ steps.setup.outputs.snapshot-hash }}-${{ steps.setup.outputs.package-hash }}-${{ steps.setup.outputs.sources-hash }}
Expand Down

0 comments on commit 0630bc4

Please sign in to comment.