Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify Stack CI, switch haskell-actions #13

Merged
merged 1 commit into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
16 changes: 7 additions & 9 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 @@ -25,17 +25,15 @@ jobs:
show-progress: false

- name: Setup Haskell
uses: haskell/actions/setup@v2
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 All @@ -97,7 +95,7 @@ jobs:
show-progress: false

- name: Setup Haskell
uses: haskell/actions/setup@v2
uses: haskell-actions/setup@v2
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc }}
Expand Down