Skip to content

Commit 07deeb7

Browse files
phadejphadej
authored
Merge pull request #724 from haskell-CI/ghc-9.10-proper
Use GHC-9.10.1 proper
2 parents 403d214 + 149d1ac commit 07deeb7

14 files changed

+10
-33
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
mkdir -p "$HOME/.ghcup/bin"
8080
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
8181
chmod a+x "$HOME/.ghcup/bin/ghcup"
82-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
8382
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
8483
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8584
env:

‎fixtures/all-versions.github‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
compilerVersion: "8.4"
3434
setup-method: hvr-ppa
3535
allow-failure: false
36-
- compiler: ghc-9.10.0.20240426
36+
- compiler: ghc-9.10.1
3737
compilerKind: ghc
38-
compilerVersion: 9.10.0.20240426
38+
compilerVersion: 9.10.1
3939
setup-method: ghcup
4040
allow-failure: false
4141
- compiler: ghc-9.8.2
@@ -306,7 +306,6 @@ jobs:
306306
mkdir -p "$HOME/.ghcup/bin"
307307
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
308308
chmod a+x "$HOME/.ghcup/bin/ghcup"
309-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
310309
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
311310
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
312311
else
@@ -319,7 +318,6 @@ jobs:
319318
mkdir -p "$HOME/.ghcup/bin"
320319
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
321320
chmod a+x "$HOME/.ghcup/bin/ghcup"
322-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
323321
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
324322
fi
325323
env:

‎fixtures/copy-fields-all.github‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ jobs:
158158
mkdir -p "$HOME/.ghcup/bin"
159159
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
160160
chmod a+x "$HOME/.ghcup/bin/ghcup"
161-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
162161
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
163162
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
164163
else
@@ -168,7 +167,6 @@ jobs:
168167
mkdir -p "$HOME/.ghcup/bin"
169168
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
170169
chmod a+x "$HOME/.ghcup/bin/ghcup"
171-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
172170
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
173171
fi
174172
env:

‎fixtures/copy-fields-none.github‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ jobs:
158158
mkdir -p "$HOME/.ghcup/bin"
159159
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
160160
chmod a+x "$HOME/.ghcup/bin/ghcup"
161-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
162161
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
163162
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
164163
else
@@ -168,7 +167,6 @@ jobs:
168167
mkdir -p "$HOME/.ghcup/bin"
169168
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
170169
chmod a+x "$HOME/.ghcup/bin/ghcup"
171-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
172170
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
173171
fi
174172
env:

‎fixtures/copy-fields-some.github‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ jobs:
158158
mkdir -p "$HOME/.ghcup/bin"
159159
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
160160
chmod a+x "$HOME/.ghcup/bin/ghcup"
161-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
162161
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
163162
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
164163
else
@@ -168,7 +167,6 @@ jobs:
168167
mkdir -p "$HOME/.ghcup/bin"
169168
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
170169
chmod a+x "$HOME/.ghcup/bin/ghcup"
171-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
172170
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
173171
fi
174172
env:

‎fixtures/doctest-version.github‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
compilerVersion: "8.4"
3434
setup-method: hvr-ppa
3535
allow-failure: false
36-
- compiler: ghc-9.10.0.20240426
36+
- compiler: ghc-9.10.1
3737
compilerKind: ghc
38-
compilerVersion: 9.10.0.20240426
38+
compilerVersion: 9.10.1
3939
setup-method: ghcup
4040
allow-failure: false
4141
- compiler: ghc-9.8.2
@@ -306,7 +306,6 @@ jobs:
306306
mkdir -p "$HOME/.ghcup/bin"
307307
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
308308
chmod a+x "$HOME/.ghcup/bin/ghcup"
309-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
310309
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
311310
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
312311
else
@@ -319,7 +318,6 @@ jobs:
319318
mkdir -p "$HOME/.ghcup/bin"
320319
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
321320
chmod a+x "$HOME/.ghcup/bin/ghcup"
322-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
323321
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
324322
fi
325323
env:

‎fixtures/doctest.github‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
compilerVersion: "8.4"
3434
setup-method: hvr-ppa
3535
allow-failure: false
36-
- compiler: ghc-9.10.0.20240426
36+
- compiler: ghc-9.10.1
3737
compilerKind: ghc
38-
compilerVersion: 9.10.0.20240426
38+
compilerVersion: 9.10.1
3939
setup-method: ghcup
4040
allow-failure: false
4141
- compiler: ghc-9.8.2
@@ -306,7 +306,6 @@ jobs:
306306
mkdir -p "$HOME/.ghcup/bin"
307307
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
308308
chmod a+x "$HOME/.ghcup/bin/ghcup"
309-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
310309
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
311310
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
312311
else
@@ -319,7 +318,6 @@ jobs:
319318
mkdir -p "$HOME/.ghcup/bin"
320319
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
321320
chmod a+x "$HOME/.ghcup/bin/ghcup"
322-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
323321
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
324322
fi
325323
env:

‎fixtures/enabled-jobs.github‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
compilerVersion: "8.4"
3434
setup-method: hvr-ppa
3535
allow-failure: false
36-
- compiler: ghc-9.10.0.20240426
36+
- compiler: ghc-9.10.1
3737
compilerKind: ghc
38-
compilerVersion: 9.10.0.20240426
38+
compilerVersion: 9.10.1
3939
setup-method: ghcup
4040
allow-failure: false
4141
- compiler: ghc-9.8.2
@@ -306,7 +306,6 @@ jobs:
306306
mkdir -p "$HOME/.ghcup/bin"
307307
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
308308
chmod a+x "$HOME/.ghcup/bin/ghcup"
309-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
310309
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
311310
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
312311
else
@@ -319,7 +318,6 @@ jobs:
319318
mkdir -p "$HOME/.ghcup/bin"
320319
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
321320
chmod a+x "$HOME/.ghcup/bin/ghcup"
322-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
323321
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
324322
fi
325323
env:

‎fixtures/fail-versions.github‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ jobs:
158158
mkdir -p "$HOME/.ghcup/bin"
159159
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
160160
chmod a+x "$HOME/.ghcup/bin/ghcup"
161-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
162161
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
163162
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
164163
else
@@ -168,7 +167,6 @@ jobs:
168167
mkdir -p "$HOME/.ghcup/bin"
169168
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
170169
chmod a+x "$HOME/.ghcup/bin/ghcup"
171-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
172170
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
173171
fi
174172
env:

‎fixtures/irc-channels.github‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@ jobs:
185185
mkdir -p "$HOME/.ghcup/bin"
186186
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
187187
chmod a+x "$HOME/.ghcup/bin/ghcup"
188-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
189188
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
190189
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
191190
else
@@ -195,7 +194,6 @@ jobs:
195194
mkdir -p "$HOME/.ghcup/bin"
196195
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
197196
chmod a+x "$HOME/.ghcup/bin/ghcup"
198-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
199197
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
200198
fi
201199
env:

0 commit comments

Comments
 (0)