Skip to content

Commit

Permalink
Use the same stack version in all CI jobs and remove stack setup st…
Browse files Browse the repository at this point in the history
…ep (#1651)

* Remove `stack setup` step as this was only required for macOS

* Use haskell setup action so same version of stack is used in tests and build
  • Loading branch information
paulcadman authored Nov 30, 2022
1 parent ebfe412 commit 3fbf9a3
Showing 1 changed file with 12 additions and 8 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,12 @@ jobs:
key: ${{ runner.os }}-${{ matrix.ghc }}-stack-work-${{ hashFiles('main/stack.yaml') }}-${{ hashFiles('main/package.yaml') }}-${{ hashFiles('main/**/*.hs') }}
restore-keys: |
${{ runner.os }}-${{ matrix.ghc }}-stack-work-
- name: Setup Stack GHC
run : |
cd main
stack setup
- uses: haskell/actions/setup@v1
name: Setup Haskell
with:
ghc-version: ${{ matrix.ghc }}
enable-stack: true
stack-version: 'latest'
- name: Cache LLVM and Clang
id: cache-llvm
uses: actions/cache@v3
Expand Down Expand Up @@ -257,10 +259,12 @@ jobs:
with:
mdbook-version: 'latest'

- name: Setup Stack GHC
run : |
cd main
stack setup
- uses: haskell/actions/setup@v1
name: Setup Haskell
with:
ghc-version: ${{ matrix.ghc }}
enable-stack: true
stack-version: 'latest'

- name: Cache LLVM and Clang
id: cache-llvm
Expand Down

0 comments on commit 3fbf9a3

Please sign in to comment.