Skip to content

Commit 36a6bc3

Browse files
authored
Merge pull request #468 from haskell/mpj/housekeeping
CI housekeeping
2 parents 5f13cf2 + dabe516 commit 36a6bc3

13 files changed

+52
-330
lines changed

.azure/linux-stack.bashrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.azure/linux-stack.yml

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

.azure/macos-stack.bashrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.azure/macos-stack.yml

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

.azure/windows-stack.bashrc

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

.azure/windows-stack.yml

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

.github/workflows/haskell.yml

Lines changed: 14 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Haskell CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
49
jobs:
510
build:
611

@@ -9,27 +14,20 @@ jobs:
914
strategy:
1015
fail-fast: false
1116
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
17+
ghc: ['9.4.3', '9.2.5', '9.0.2', '8.10.7']
18+
# Unlikely that we'll succeed on windows and fail on macos,
19+
# including it is just burning CI time. But windows could have
20+
# path or IO issues, so worth including
21+
os: [ubuntu-latest, windows-latest]
2322

2423
steps:
25-
- uses: actions/checkout@v2
26-
- uses: haskell/actions/setup@v1
24+
- uses: actions/checkout@v3
25+
- uses: haskell/actions/setup@v2
2726
with:
2827
ghc-version: ${{ matrix.ghc }}
29-
cabal-version: '3.6'
3028

3129
- name: Cabal cache
32-
uses: actions/cache@v1
30+
uses: actions/cache@v3
3331
env:
3432
cache-name: cache-cabal
3533
with:
@@ -38,32 +36,12 @@ jobs:
3836
restore-keys: |
3937
${{ runner.os }}-build-${{ env.cache-name }}-
4038
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-
5139
- name: Cabal update
5240
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
5941
- name: Build using cabal
6042
run: cabal build all
6143
- name: Test
6244
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
6745

6846
haskell_post_job:
6947
runs-on: ubuntu-latest

.github/workflows/nix.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: Nix
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
48

59
jobs:
610
nix:
@@ -12,10 +16,10 @@ jobs:
1216
os: [ubuntu-latest, macOS-latest]
1317

1418
steps:
15-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
1620
with:
1721
submodules: true
18-
- uses: cachix/install-nix-action@v16
22+
- uses: cachix/install-nix-action@v18
1923
with:
2024
nix_path: nixpkgs=channel:nixos-unstable
2125
- run: nix-shell --run "cabal update && cabal build all"

azure-pipelines.yml

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

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ packages:
66
package lsp
77
flags: +demo
88

9-
index-state: 2022-08-25T22:25:05Z
9+
index-state: 2023-01-01T00:00:00Z
1010

1111
tests: True
1212
benchmarks: True

0 commit comments

Comments
 (0)