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

CI: bump GHC 9.6 to 9.6.4 and actions/cache to v4 #257

Merged
merged 1 commit into from
Jan 28, 2024
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 .github/workflows/fix-whitespace.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check for whitespace violations
uses: andreasabel/fix-whitespace-action@v1
11 changes: 4 additions & 7 deletions .github/workflows/haskell-ci-simple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ on:
push:
branches:
- master
- ci-*
- release-*
pull_request:
branches:
- master
- ci-*
- release-*

defaults:
run:
Expand All @@ -34,7 +30,7 @@ jobs:
# - "9.0.2"
# - "9.2.8"
- "9.4.8"
- "9.6.3"
- "9.6.4"
- "9.8.1"
include:
- ghc: "9.8.1"
Expand All @@ -52,7 +48,7 @@ jobs:
cabal-version: "latest"
cabal-update: true

- uses: actions/cache@v3
- uses: actions/cache@v4
name: Cache cabal stuff
with:
path: |
Expand Down Expand Up @@ -84,7 +80,8 @@ jobs:
- name: Test
run: |
cd alex-*/
export ALEX=$(cabal list-bin alex)
ALEX="$(cabal list-bin alex)"
export ALEX
cabal run --enable-tests alex:test:tests

- name: Haddock
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,18 @@
#
# For more information, see https://github.com/andreasabel/haskell-ci
#
# version: 0.17.20231112
# version: 0.17.20240127
#
# REGENDATA ("0.17.20231112",["github","alex.cabal"])
# REGENDATA ("0.17.20240127",["github","alex.cabal"])
#
name: Haskell-CI
on:
push:
branches:
- master
- ci-*
- release-*
pull_request:
branches:
- master
- ci-*
- release-*
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand All @@ -41,9 +37,9 @@ jobs:
compilerVersion: 9.8.1
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.6.3
- compiler: ghc-9.6.4
compilerKind: ghc
compilerVersion: 9.6.3
compilerVersion: 9.6.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.8
Expand Down Expand Up @@ -225,7 +221,7 @@ jobs:
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
cabal-plan
- name: restore cache
uses: actions/cache/restore@v3
uses: actions/cache/restore@v4
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
Expand Down Expand Up @@ -261,7 +257,7 @@ jobs:
rm -f cabal.project.local
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
- name: save cache
uses: actions/cache/save@v3
uses: actions/cache/save@v4
if: always()
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion alex.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build-type: Simple

tested-with:
GHC == 9.8.1
GHC == 9.6.3
GHC == 9.6.4
GHC == 9.4.8
GHC == 9.2.8
GHC == 9.0.2
Expand Down
2 changes: 1 addition & 1 deletion cabal.haskell-ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
branches: master ci-* release-*
branches: master

-- -- For bootstrapping:
-- apt: alex happy
Expand Down
Loading