Skip to content

Commit

Permalink
Simplify Stack CI
Browse files Browse the repository at this point in the history
For Stack CI, GHC doesn't need to be installed globally; only the
version installed by Stack is actually used.

Also bump all Stack/GHC versions in CI
  • Loading branch information
DigitalBrains1 committed Oct 11, 2023
1 parent 88947ad commit d79f6b8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .ci/stack-9.4.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
resolver: lts-21.12
resolver: lts-21.14
ghc-options:
"$locals": -Wall -Wcompat
2 changes: 1 addition & 1 deletion .ci/stack-9.6.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
resolver: nightly-2023-09-17
resolver: nightly-2023-10-09
ghc-options:
"$locals": -Wall -Wcompat
12 changes: 5 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.7", "9.6.2"]
ghc: ["8.6", "8.8", "8.10", "9.0", "9.2", "9.4", "9.6"]
fail-fast: false
steps:
- name: Checkout
Expand All @@ -28,14 +28,12 @@ jobs:
uses: haskell/actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
enable-stack: true
stack-no-global: true

- name: General Setup
run: |
declare GHC_VERSION=${{ matrix.ghc }}
# Rewrite an argument of the form X.Y.Z to X.Y
cp .ci/stack-${GHC_VERSION%.*}.yaml stack.yaml
cp .ci/stack-{{ matrix.ghc }}.yaml stack.yaml
# Print out some information for debugging purposes
ghc --version
stack --version
Expand Down Expand Up @@ -81,12 +79,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.7", "9.6.2"]
ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.7", "9.6.3"]
project-variant: [""]
include:
- ghc: 8.6.5
project-variant: -lower
- ghc: 9.6.2
- ghc: 9.6.3
project-variant: -upper

fail-fast: false
Expand Down

0 comments on commit d79f6b8

Please sign in to comment.