Skip to content

Commit

Permalink
refix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
dorchard committed Sep 12, 2024
1 parent 28d8c9e commit 20cbf70
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
runs-on: ubuntu-latest
name: Ubuntu / Stack / test
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2

# relative paths are relative to the project directory
- name: Cache Stack build artifacts (user + project)
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: |
~/.stack
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
# My issue on haskell/actions: https://github.com/haskell/actions/issues/41
# This also requires us to do a deep fetch, else we don't get the Git commit
# history we need to rewrite mod times.
- uses: actions/checkout@v4
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set all tracked file modification times to the time of their last commit
Expand All @@ -81,15 +81,15 @@ jobs:
- name: Setup Haskell build environment
id: setup-haskell-build-env
uses: haskell/actions/setup@v4
uses: haskell/actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- run: cabal freeze

- name: Cache Cabal build artifacts
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: |
${{ steps.setup-haskell-build-env.outputs.cabal-store }}
Expand All @@ -114,19 +114,19 @@ jobs:
steps:

# TODO figure out timestamp fixer on Mac (no Mac available to test)
- uses: actions/checkout@v4
- uses: actions/checkout@v2

- name: Setup Haskell build environment
id: setup-haskell-build-env
uses: haskell/actions/setup@v4
uses: haskell/actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- run: cabal freeze

- name: Cache Cabal build artifacts
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: |
${{ steps.setup-haskell-build-env.outputs.cabal-store }}
Expand Down Expand Up @@ -162,19 +162,19 @@ jobs:
ghc: ["9.2"]
steps:
# TODO figure out timestamp fixer on Windows (need Bash)
- uses: actions/checkout@v4
- uses: actions/checkout@v2

- name: Setup Haskell build environment
id: setup-haskell-build-env
uses: haskell/actions/setup@v4
uses: haskell/actions/setup@v2
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- run: cabal freeze

- name: Cache Cabal build artifacts
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: |
${{ steps.setup-haskell-build-env.outputs.cabal-store }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/disabled/hackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
# My issue on haskell/actions: https://github.com/haskell/actions/issues/41
# This also requires us to do a deep fetch, else we don't get the Git commit
# history we need to rewrite mod times.
- uses: actions/checkout@v4
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Set all tracked file modification times to the time of their last commit
Expand All @@ -56,7 +56,7 @@ jobs:
- run: cabal freeze

- name: Cache global Cabal store
uses: actions/cache@v4
uses: actions/cache@v2
with:
path: ~/.cabal/store
key: hackage-deps-${{ runner.os }}-ghc_${{ env.ghc }}
Expand Down

0 comments on commit 20cbf70

Please sign in to comment.