Skip to content

Commit a2d367b

Browse files
committed
Update workflows, drop stack from CI
1 parent 666a317 commit a2d367b

File tree

3 files changed

+10
-51
lines changed

3 files changed

+10
-51
lines changed

.github/workflows/haskell.yml

Lines changed: 8 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,20 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
ghc: ['9.2.4', '9.0.2', '8.10.7', '8.8.4', '8.6.5']
13-
os: [ubuntu-latest, macOS-latest, windows-latest]
14-
ospath: [true, false]
15-
exclude:
16-
# newer 'entropy' doesn't work with old 'unix', and it doesn't have a correct version bound.
17-
- ospath: true
18-
ghc: 8.6.5
19-
# "cabal build" always timeout
20-
- ospath: true
21-
ghc: 8.8.4
22-
os: windows-latest
12+
ghc: ['9.4.3', '9.2.5', '9.0.2', '8.10.7']
13+
# Unlikely that we'll succeed on windows and fail on macos,
14+
# including it is just burning CI time. But windows could have
15+
# path or IO issues, so worth including
16+
os: [ubuntu-latest, windows-latest]
2317

2418
steps:
25-
- uses: actions/checkout@v2
26-
- uses: haskell/actions/setup@v1
19+
- uses: actions/checkout@v3
20+
- uses: haskell/actions/setup@v2
2721
with:
2822
ghc-version: ${{ matrix.ghc }}
29-
cabal-version: '3.6'
3023

3124
- name: Cabal cache
32-
uses: actions/cache@v1
25+
uses: actions/cache@v3
3326
env:
3427
cache-name: cache-cabal
3528
with:
@@ -38,32 +31,12 @@ jobs:
3831
restore-keys: |
3932
${{ runner.os }}-build-${{ env.cache-name }}-
4033
41-
- name: Stack cache
42-
uses: actions/cache@v1
43-
env:
44-
cache-name: cache-stack
45-
with:
46-
path: ~/.stack
47-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/stack.yaml') }}
48-
restore-keys: |
49-
${{ runner.os }}-build-${{ env.cache-name }}-
50-
5134
- name: Cabal update
5235
run: cabal update
53-
- name: Cabal configure
54-
shell: bash
55-
run: |
56-
if [ ${{ matrix.ospath }} = "true" ]; then
57-
cabal configure --flags="force-ospath"
58-
fi
5936
- name: Build using cabal
6037
run: cabal build all
6138
- name: Test
6239
run: cabal test all
63-
# stack build uses stack.yaml which actually uses ghc-8.10.7
64-
- if: matrix.ghc == '8.10.7' && runner.os == 'Linux'
65-
name: Build using stack
66-
run: stack build
6740

6841
haskell_post_job:
6942
runs-on: ubuntu-latest

.github/workflows/nix.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
os: [ubuntu-latest, macOS-latest]
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
with:
1717
submodules: true
18-
- uses: cachix/install-nix-action@v16
18+
- uses: cachix/install-nix-action@v18
1919
with:
2020
nix_path: nixpkgs=channel:nixos-unstable
2121
- run: nix-shell --run "cabal update && cabal build all"

stack.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)