Skip to content

Commit 65318cc

Browse files
authored
Avoid templating GitHub Actions workflow (#7952)
* Avoid templating GitHub Actions workflow GitHub Actions workflow have sufficient power to express what we need. We don't need to maintain and additional templating solution on top. * Add GHC 9.2, bump bounds, fix syntax * Switch to official haskell image * Always run cli tests for ghc 8.2 and above * Remove step to regenerate GitHub Actions workflows * Fix missed reference to GHC version * Fix yaml syntax * Fix type in the GHC version * More CI changes - Run bootstrap.yml on ubuntu-latest - Use explicit matrix for linux.yml - Drop containers in favour of haskell setup action - Drop workaround for ancient git * Remove unneeded package from CI setup I belive this is only necessary to run `cabal man` which we do not in the CI. * Drop old GHCs from the CI * Switch macos.yml to haskell/action/setup Also add the same GHC versions as Linux. * Simplify CI - Remove cabal-plan, we actually never call it (I think) - Remove vendored cabal-doctest - Remove few stray allow-newer clauses no longer necessary, apparently Originally done by @gbaz in PR #7907. * Mark GHC 9.2.1 as experimental * Remove reference to cabal-plan from validate.sh * setup-haskell action already runs cabal update * Add missing build matrix in test-windows-dogfood * Replace cabal-plan list-bin with cabal list-bin * Enable caching in the CI * Fix typo * Remove continue-on-error until I figure it out * Keep naming consistent * Temporarily disable 8.0.2 on macos * Add missing step id * Tweaks Remove workaround for nektos/act, it accidentally sneaked in. * More tweaks * Tweaks * Restore cabal-plan, temporarily mark everything experimental cabal list-bin doesn't seem to work like cabal-plan does. * Tweaks * Ensure cabal-plan executable gets built * Install automake on MacOS * Tweaks * Tweaks Link experimental flags to relative GitHub issues * Fix typo
1 parent 9a104a9 commit 65318cc

28 files changed

+217
-2310
lines changed

.github/workflows/bootstrap.yml

+11-32
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
# This file is auto-generated
2-
#
3-
# To regenerate it run
4-
#
5-
# make github-actions
6-
#
71
name: Bootstrap
2+
83
on:
94
push:
105
branches:
@@ -15,37 +10,21 @@ on:
1510
- created
1611

1712
jobs:
18-
bootstrap-linux:
19-
name: Bootstrap on Linux
20-
runs-on: ubuntu-18.04
21-
steps:
22-
- uses: actions/checkout@v2
23-
- name: bootstrap.py
24-
run: |
25-
ghcup config set cache true
26-
ghcup install ghc 8.10.7
27-
python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json
28-
29-
- name: Smoke test
30-
run: |
31-
_build/bin/cabal --version
32-
33-
- uses: actions/upload-artifact@v2
34-
with:
35-
name: cabal-linux-bootstrapped
36-
path: _build/artifacts/*
37-
38-
bootstrap-macos:
39-
name: Bootstrap on macOS
40-
runs-on: macos-latest
13+
bootstrap:
14+
strategy:
15+
matrix:
16+
os:
17+
- ubuntu-latest
18+
- macos-latest
19+
name: Bootstrap ${{ matrix.os }}
20+
runs-on: ${{ matrix.os }}
4121
steps:
4222
- uses: actions/checkout@v2
43-
44-
# We use linux dependencies
4523
- name: bootstrap.py
4624
run: |
4725
ghcup config set cache true
4826
ghcup install ghc 8.10.7
27+
# We use linux dependencies also on macos
4928
python3 bootstrap/bootstrap.py -w $(ghcup whereis ghc 8.10.7) -d bootstrap/linux-8.10.7.json
5029
5130
- name: Smoke test
@@ -54,5 +33,5 @@ jobs:
5433
5534
- uses: actions/upload-artifact@v2
5635
with:
57-
name: cabal-macos-bootstrapped
36+
name: cabal-${{ matrix.os }}-bootstrapped
5837
path: _build/artifacts/*

0 commit comments

Comments
 (0)