Skip to content

Commit 75c26bf

Browse files
hamishmackhamishmack
committed
Use ghc 9.6.6 for github tests
1 parent 40c7827 commit 75c26bf

File tree

2 files changed

+40
-40
lines changed

2 files changed

+40
-40
lines changed

‎.github/workflows/pipeline.yml

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Run tests with ghc8107"
1+
name: "Run tests with ghc966"
22

33
on:
44
pull_request:
@@ -22,120 +22,120 @@ jobs:
2222
runs-on: [self-hosted, linux]
2323
steps:
2424
- uses: actions/checkout@v4
25-
- name: "Run tests with ghc8107: Running the nix-build tests..."
26-
run: "./test/tests.sh ghc8107 nix-build"
25+
- name: "Run tests with ghc966: Running the nix-build tests..."
26+
run: "./test/tests.sh ghc966 nix-build"
2727

2828
unit-tests:
2929
runs-on: [self-hosted, linux]
3030
steps:
3131
- uses: actions/checkout@v4
32-
- name: "Run tests with ghc8107: Running the unit tests..."
33-
run: "./test/tests.sh ghc8107 unit-tests"
32+
- name: "Run tests with ghc966: Running the unit tests..."
33+
run: "./test/tests.sh ghc966 unit-tests"
3434

3535
runghc:
3636
runs-on: [self-hosted, linux]
3737
steps:
3838
- uses: actions/checkout@v4
39-
- name: "Run tests with ghc8107: Checking that a nix-shell works for runghc..."
40-
run: "./test/tests.sh ghc8107 runghc"
39+
- name: "Run tests with ghc966: Checking that a nix-shell works for runghc..."
40+
run: "./test/tests.sh ghc966 runghc"
4141

4242
cabal:
4343
runs-on: [self-hosted, linux]
4444
steps:
4545
- uses: actions/checkout@v4
46-
- name: "Run tests with ghc8107: Checking that a nix-shell works for cabal..."
47-
run: "./test/tests.sh ghc8107 cabal"
46+
- name: "Run tests with ghc966: Checking that a nix-shell works for cabal..."
47+
run: "./test/tests.sh ghc966 cabal"
4848

4949
cabal-doExactConfig:
5050
runs-on: [self-hosted, linux]
5151
steps:
5252
- uses: actions/checkout@v4
53-
- name: "Run tests with ghc8107: Checking that a nix-shell works for cabal (doExactConfig component)..."
54-
run: "./test/tests.sh ghc8107 cabal-doExactConfig"
53+
- name: "Run tests with ghc966: Checking that a nix-shell works for cabal (doExactConfig component)..."
54+
run: "./test/tests.sh ghc966 cabal-doExactConfig"
5555

5656
tests-benchmarks:
5757
runs-on: [self-hosted, linux]
5858
steps:
5959
- uses: actions/checkout@v4
60-
- name: "Run tests with ghc8107: Checking that a nix-shell works for a project with test-suite build-tools and benchmarks..."
61-
run: "./test/tests.sh ghc8107 tests-benchmarks"
60+
- name: "Run tests with ghc966: Checking that a nix-shell works for a project with test-suite build-tools and benchmarks..."
61+
run: "./test/tests.sh ghc966 tests-benchmarks"
6262

6363
multi-target:
6464
runs-on: [self-hosted, linux]
6565
steps:
6666
- uses: actions/checkout@v4
67-
- name: "Run tests with ghc8107: Checking that a nix-shell works for a multi-target project..."
68-
run: "./test/tests.sh ghc8107 multi-target"
67+
- name: "Run tests with ghc966: Checking that a nix-shell works for a multi-target project..."
68+
run: "./test/tests.sh ghc966 multi-target"
6969

7070
shellFor-single-package:
7171
runs-on: [self-hosted, linux]
7272
steps:
7373
- uses: actions/checkout@v4
74-
- name: "Run tests with ghc8107: Checking shellFor works for a cabal project, multiple packages..."
75-
run: "./test/tests.sh ghc8107 shellFor-single-package"
74+
- name: "Run tests with ghc966: Checking shellFor works for a cabal project, multiple packages..."
75+
run: "./test/tests.sh ghc966 shellFor-single-package"
7676

7777
shellFor-multiple-package:
7878
runs-on: [self-hosted, linux]
7979
steps:
8080
- uses: actions/checkout@v4
81-
- name: "Run tests with ghc8107: Checking shellFor works for a cabal project, single package...y"
82-
run: "./test/tests.sh ghc8107 shellFor-multiple-package"
81+
- name: "Run tests with ghc966: Checking shellFor works for a cabal project, single package...y"
82+
run: "./test/tests.sh ghc966 shellFor-multiple-package"
8383

8484
shellFor-hoogle:
8585
runs-on: [self-hosted, linux]
8686
steps:
8787
- uses: actions/checkout@v4
88-
- name: "Run tests with ghc8107: Checking shellFor works for a cabal project, single package..."
89-
run: "./test/tests.sh ghc8107 shellFor-hoogle"
88+
- name: "Run tests with ghc966: Checking shellFor works for a cabal project, single package..."
89+
run: "./test/tests.sh ghc966 shellFor-hoogle"
9090

9191
shellFor-not-depends:
9292
runs-on: [self-hosted, linux]
9393
steps:
9494
- uses: actions/checkout@v4
95-
- name: "Run tests with ghc8107: Checking shellFor does not depend on given packages...y"
96-
run: "./test/tests.sh ghc8107 shellFor-not-depends"
95+
- name: "Run tests with ghc966: Checking shellFor does not depend on given packages...y"
96+
run: "./test/tests.sh ghc966 shellFor-not-depends"
9797

9898
maintainer-scripts:
9999
runs-on: [self-hosted, linux]
100100
steps:
101101
- uses: actions/checkout@v4
102-
- name: "Run tests with ghc8107: Checking the maintainer scripts...y"
103-
run: "./test/tests.sh ghc8107 maintainer-scripts"
102+
- name: "Run tests with ghc966: Checking the maintainer scripts...y"
103+
run: "./test/tests.sh ghc966 maintainer-scripts"
104104

105105
plan-extra-hackages:
106106
runs-on: [self-hosted, linux]
107107
steps:
108108
- uses: actions/checkout@v4
109-
- name: "Run tests with ghc8107: Checking that plan construction works with extra Hackages..."
110-
run: "./test/tests.sh ghc8107 plan-extra-hackages"
109+
- name: "Run tests with ghc966: Checking that plan construction works with extra Hackages..."
110+
run: "./test/tests.sh ghc966 plan-extra-hackages"
111111

112112
build-extra-hackages:
113113
runs-on: [self-hosted, linux]
114114
steps:
115115
- uses: actions/checkout@v4
116-
- name: "Run tests with ghc8107: Checking that package with extra Hackages can be build..."
117-
run: "./test/tests.sh ghc8107 build-extra-hackages"
116+
- name: "Run tests with ghc966: Checking that package with extra Hackages can be build..."
117+
run: "./test/tests.sh ghc966 build-extra-hackages"
118118

119119
hix:
120120
runs-on: [self-hosted, linux]
121121
steps:
122122
- uses: actions/checkout@v4
123-
- name: "Run tests with ghc8107: End-2-end test of hix project initialization and flakes development shell ..."
124-
run: "./test/tests.sh ghc8107 hix"
123+
- name: "Run tests with ghc966: End-2-end test of hix project initialization and flakes development shell ..."
124+
run: "./test/tests.sh ghc966 hix"
125125

126126
# template:
127127
# runs-on: [self-hosted, linux]
128128
# steps:
129129
# - uses: actions/checkout@v4
130-
# - name: "Run tests with ghc8107: End-2-end test of hix project initialization and flakes development shell ..."
131-
# run: "./test/tests.sh ghc8107 template"
130+
# - name: "Run tests with ghc966: End-2-end test of hix project initialization and flakes development shell ..."
131+
# run: "./test/tests.sh ghc966 template"
132132

133133
docs:
134134
runs-on: [self-hosted, linux]
135135
steps:
136136
- uses: actions/checkout@v4
137137
- name: "Test examples in documentation ..."
138-
run: "./test/tests.sh ghc8107 docs"
138+
run: "./test/tests.sh ghc966 docs"
139139

140140
hydra-ifdLevel-0-and-1:
141141
runs-on: [self-hosted, linux]
@@ -178,9 +178,9 @@ jobs:
178178
runs-on: [self-hosted, linux]
179179
steps:
180180
- uses: actions/checkout@v4
181-
- name: "Check closure size with ghc8107"
181+
- name: "Check closure size with ghc966"
182182
run: |
183-
nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc8107 -o check-closure-size.sh
183+
nix-build build.nix -A maintainer-scripts.check-closure-size --argstr compiler-nix-name ghc966 -o check-closure-size.sh
184184
echo "+++ Closure size (MB)"
185185
./check-closure-size.sh
186186
@@ -208,7 +208,7 @@ jobs:
208208
- uses: actions/checkout@v4
209209
- name: "Make sure non store paths like can be used as src"
210210
run: |
211-
nix-build build.nix -A maintainer-scripts.check-path-support --argstr compiler-nix-name ghc8107 -o check-path-support.sh
211+
nix-build build.nix -A maintainer-scripts.check-path-support --argstr compiler-nix-name ghc966 -o check-path-support.sh
212212
./check-path-support.sh
213213
214214
haskell-nix-roots-do-not-require-IFDs:
@@ -218,12 +218,12 @@ jobs:
218218
- name: "Check that the haskell.nix roots do not require IFDs"
219219
run: nix build .#roots.x86_64-linux --accept-flake-config --option allow-import-from-derivation false
220220

221-
hydra-without-remote-builders-ghc8107:
221+
hydra-without-remote-builders-ghc966:
222222
runs-on: [self-hosted, linux]
223223
steps:
224224
- uses: actions/checkout@v4
225225
- name: "Check that evaluation of hydra jobs works without using remote builders for GHC 8.10.7"
226-
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc8107-native --show-trace --builders ''
226+
run: nix path-info --derivation .#requiredJobs.x86_64-darwin.required-unstable-ghc966-native --show-trace --builders ''
227227

228228
hydra-without-remote-builders-ghc9101:
229229
runs-on: [self-hosted, linux]

‎test/tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fi
107107

108108
# These tests still use manually generated `pkgs`. They were left that way
109109
# so that we would still be testing that workflow.
110-
SHELL_FOR_GHC="ghc8107"
110+
SHELL_FOR_GHC="ghc966"
111111
if [ "$TESTS" == "shellFor-single-package" ] || [ "$TESTS" == "all" ]; then
112112
printf "*** Checking shellFor works for a cabal project, multiple packages...\n" >& 2
113113
nix-shell $NIX_BUILD_ARGS \

0 commit comments

Comments
 (0)