Skip to content

Commit 4cbd4f5

Browse files
committed
GitHub CI: Update GHC versions for release and testing
Release builds are built with GHC 9.6.5 (up from 9.4.8) which is now considered a stable and reliable build by the GHC team (although a version 9.6.6 is coming). Add testing, not only for 9.8.2, but also for the new 9.10.1 and continue testing 9.4.8 (which GHCUP labels as recommended). And add some comments and delimiters to the CI yaml.
1 parent 80d9f7a commit 4cbd4f5

File tree

1 file changed

+47
-12
lines changed

1 file changed

+47
-12
lines changed

.github/workflows/ci.yml

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ name: CI
44
on: [ push, pull_request ]
55

66
jobs:
7+
8+
# ------------------------------
9+
# Basic linting requirements for new commits
10+
711
build-check-src:
812
name: "Check: code cleanliness"
913
runs-on: ubuntu-20.04
@@ -26,6 +30,9 @@ jobs:
2630
../.github/workflows/check_confdir.py
2731
../.github/workflows/check_symlinks.py
2832
33+
# ------------------------------
34+
# Builds for release, using a reliable and stable version of GHC
35+
2936
build-and-test-ubuntu:
3037
strategy:
3138
matrix:
@@ -35,8 +42,8 @@ jobs:
3542
uses: ./.github/workflows/build-and-test-ubuntu.yml
3643
with:
3744
os: ${{ matrix.os }}
38-
ghc_version: 9.4.8
39-
hls_version: 2.7.0.0
45+
ghc_version: 9.6.5
46+
hls_version: 2.8.0.0
4047
secrets: inherit
4148

4249
build-and-test-macos:
@@ -48,28 +55,53 @@ jobs:
4855
uses: ./.github/workflows/build-and-test-macos.yml
4956
with:
5057
os: ${{ matrix.os }}
51-
ghc_version: 9.4.8
52-
hls_version: 2.7.0.0
58+
ghc_version: 9.6.5
59+
hls_version: 2.8.0.0
5360
secrets: inherit
5461

55-
build-and-test-ghc-latest-ubuntu:
56-
name: "Build/Test: GHC latest Ubuntu"
62+
# ------------------------------
63+
# Tests using other recent versions of GHC, particularly newer ones,
64+
# in anticipation of upgrading the release builds to that version
65+
66+
build-and-test-ghc-ubuntu:
67+
strategy:
68+
matrix:
69+
ghc:
70+
- version: 9.4.8
71+
hls: 2.7.0.0
72+
- version: 9.8.2
73+
hls: 2.7.0.0
74+
- version: 9.10.1
75+
hls:
76+
name: "Build/Test: GHC Ubuntu"
5777
uses: ./.github/workflows/build-and-test-ubuntu.yml
5878
with:
5979
os: ubuntu-22.04
60-
ghc_version: 9.8.2
61-
hls_version: 2.7.0.0
80+
ghc_version: ${{ matrix.ghc.version }}
81+
hls_version: ${{ matrix.ghc.hls }}
6282
secrets: inherit
6383

64-
build-and-test-ghc-latest-macos:
65-
name: "Build/Test: GHC latest macOS"
84+
build-and-test-ghc-macos:
85+
strategy:
86+
matrix:
87+
ghc:
88+
- version: 9.4.8
89+
hls: 2.7.0.0
90+
- version: 9.8.2
91+
hls: 2.7.0.0
92+
- version: 9.10.1
93+
hls:
94+
name: "Build/Test: GHC macOS"
6695
uses: ./.github/workflows/build-and-test-macos.yml
6796
with:
6897
os: macos-14
69-
ghc_version: 9.8.2
70-
hls_version: 2.7.0.0
98+
ghc_version: ${{ matrix.ghc.version }}
99+
hls_version: ${{ matrix.ghc.hls }}
71100
secrets: inherit
72101

102+
# ------------------------------
103+
# Test the building of documentation
104+
73105
build-doc-ubuntu:
74106
strategy:
75107
matrix:
@@ -149,6 +181,9 @@ jobs:
149181
name: ${{matrix.os}}-doc-not-tar
150182
path: inst/doc
151183

184+
# ------------------------------
185+
# Build platform-generic documents for releases
186+
152187
build-releasenotes-ubuntu:
153188
# Release Notes only need to be built once, so we build on recent
154189
# Ubuntu, not Mac OS. Later, the release script will copy the

0 commit comments

Comments
 (0)