Skip to content

Commit 4765b1c

Browse files
phadejphadej
authored
Merge pull request #759 from haskell-CI/ghc-9.12.1
GHC-9.12.1 proper
2 parents 4a2f5df + cdbcc00 commit 4765b1c

File tree

9 files changed

+27
-109
lines changed

9 files changed

+27
-109
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
- name: cache (tools)
164164
uses: actions/cache/restore@v4
165165
with:
166-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ff63ec70
166+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e88c451c
167167
path: ~/.haskell-ci-tools
168168
- name: install cabal-plan
169169
run: |
@@ -191,7 +191,7 @@ jobs:
191191
if: always()
192192
uses: actions/cache/save@v4
193193
with:
194-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ff63ec70
194+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-e88c451c
195195
path: ~/.haskell-ci-tools
196196
- name: checkout
197197
uses: actions/checkout@v4

‎fixtures/all-versions.github‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.0.20241128
31+
- compiler: ghc-9.12.1
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241128
34-
setup-method: ghcup-prerelease
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
3535
allow-failure: false
3636
- compiler: ghc-9.10.1
3737
compilerKind: ghc
@@ -342,21 +342,6 @@ jobs:
342342
HCKIND: ${{ matrix.compilerKind }}
343343
HCNAME: ${{ matrix.compiler }}
344344
HCVER: ${{ matrix.compilerVersion }}
345-
- name: Install GHC (GHCup prerelease)
346-
if: matrix.setup-method == 'ghcup-prerelease'
347-
run: |
348-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
349-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
350-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
351-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
352-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
353-
echo "HC=$HC" >> "$GITHUB_ENV"
354-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
355-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
356-
env:
357-
HCKIND: ${{ matrix.compilerKind }}
358-
HCNAME: ${{ matrix.compiler }}
359-
HCVER: ${{ matrix.compilerVersion }}
360345
- name: Set PATH and environment variables
361346
run: |
362347
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎fixtures/doctest-version.github‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.0.20241128
31+
- compiler: ghc-9.12.1
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241128
34-
setup-method: ghcup-prerelease
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
3535
allow-failure: false
3636
- compiler: ghc-9.10.1
3737
compilerKind: ghc
@@ -342,21 +342,6 @@ jobs:
342342
HCKIND: ${{ matrix.compilerKind }}
343343
HCNAME: ${{ matrix.compiler }}
344344
HCVER: ${{ matrix.compilerVersion }}
345-
- name: Install GHC (GHCup prerelease)
346-
if: matrix.setup-method == 'ghcup-prerelease'
347-
run: |
348-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
349-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
350-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
351-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
352-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
353-
echo "HC=$HC" >> "$GITHUB_ENV"
354-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
355-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
356-
env:
357-
HCKIND: ${{ matrix.compilerKind }}
358-
HCNAME: ${{ matrix.compiler }}
359-
HCVER: ${{ matrix.compilerVersion }}
360345
- name: Set PATH and environment variables
361346
run: |
362347
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -423,7 +408,7 @@ jobs:
423408
- name: cache (tools)
424409
uses: actions/cache/restore@v4
425410
with:
426-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-58bfb495
411+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-7adc43de
427412
path: ~/.haskell-ci-tools
428413
- name: install cabal-plan
429414
run: |
@@ -442,7 +427,7 @@ jobs:
442427
if: always()
443428
uses: actions/cache/save@v4
444429
with:
445-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-58bfb495
430+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-7adc43de
446431
path: ~/.haskell-ci-tools
447432
- name: checkout
448433
uses: actions/checkout@v4

‎fixtures/doctest.github‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.0.20241128
31+
- compiler: ghc-9.12.1
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241128
34-
setup-method: ghcup-prerelease
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
3535
allow-failure: false
3636
- compiler: ghc-9.10.1
3737
compilerKind: ghc
@@ -342,21 +342,6 @@ jobs:
342342
HCKIND: ${{ matrix.compilerKind }}
343343
HCNAME: ${{ matrix.compiler }}
344344
HCVER: ${{ matrix.compilerVersion }}
345-
- name: Install GHC (GHCup prerelease)
346-
if: matrix.setup-method == 'ghcup-prerelease'
347-
run: |
348-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
349-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
350-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
351-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
352-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
353-
echo "HC=$HC" >> "$GITHUB_ENV"
354-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
355-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
356-
env:
357-
HCKIND: ${{ matrix.compilerKind }}
358-
HCNAME: ${{ matrix.compiler }}
359-
HCVER: ${{ matrix.compilerVersion }}
360345
- name: Set PATH and environment variables
361346
run: |
362347
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -423,7 +408,7 @@ jobs:
423408
- name: cache (tools)
424409
uses: actions/cache/restore@v4
425410
with:
426-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ae4cd18b
411+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-cc3c62c0
427412
path: ~/.haskell-ci-tools
428413
- name: install cabal-plan
429414
run: |
@@ -442,7 +427,7 @@ jobs:
442427
if: always()
443428
uses: actions/cache/save@v4
444429
with:
445-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-ae4cd18b
430+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-cc3c62c0
446431
path: ~/.haskell-ci-tools
447432
- name: checkout
448433
uses: actions/checkout@v4

‎fixtures/empty-line.github‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -178,21 +178,6 @@ jobs:
178178
HCKIND: ${{ matrix.compilerKind }}
179179
HCNAME: ${{ matrix.compiler }}
180180
HCVER: ${{ matrix.compilerVersion }}
181-
- name: Install GHC (GHCup prerelease)
182-
if: matrix.setup-method == 'ghcup-prerelease'
183-
run: |
184-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
185-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
186-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
187-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
188-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
189-
echo "HC=$HC" >> "$GITHUB_ENV"
190-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
191-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
192-
env:
193-
HCKIND: ${{ matrix.compilerKind }}
194-
HCNAME: ${{ matrix.compiler }}
195-
HCVER: ${{ matrix.compilerVersion }}
196181
- name: Set PATH and environment variables
197182
run: |
198183
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎fixtures/enabled-jobs.github‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.0.20241128
31+
- compiler: ghc-9.12.1
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241128
34-
setup-method: ghcup-prerelease
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
3535
allow-failure: false
3636
- compiler: ghc-9.10.1
3737
compilerKind: ghc
@@ -342,21 +342,6 @@ jobs:
342342
HCKIND: ${{ matrix.compilerKind }}
343343
HCNAME: ${{ matrix.compiler }}
344344
HCVER: ${{ matrix.compilerVersion }}
345-
- name: Install GHC (GHCup prerelease)
346-
if: matrix.setup-method == 'ghcup-prerelease'
347-
run: |
348-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
349-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
350-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
351-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
352-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
353-
echo "HC=$HC" >> "$GITHUB_ENV"
354-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
355-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
356-
env:
357-
HCKIND: ${{ matrix.compilerKind }}
358-
HCNAME: ${{ matrix.compiler }}
359-
HCVER: ${{ matrix.compilerVersion }}
360345
- name: Set PATH and environment variables
361346
run: |
362347
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎fixtures/messy.github‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -179,21 +179,6 @@ jobs:
179179
HCKIND: ${{ matrix.compilerKind }}
180180
HCNAME: ${{ matrix.compiler }}
181181
HCVER: ${{ matrix.compilerVersion }}
182-
- name: Install GHC (GHCup prerelease)
183-
if: matrix.setup-method == 'ghcup-prerelease'
184-
run: |
185-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
186-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
187-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
188-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
189-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
190-
echo "HC=$HC" >> "$GITHUB_ENV"
191-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
192-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
193-
env:
194-
HCKIND: ${{ matrix.compilerKind }}
195-
HCNAME: ${{ matrix.compiler }}
196-
HCVER: ${{ matrix.compilerVersion }}
197182
- name: Set PATH and environment variables
198183
run: |
199184
echo "$HOME/.cabal/bin" >> $GITHUB_PATH

‎haskell-ci.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: haskell-ci
3-
version: 0.19.20241218
3+
version: 0.19.20241219
44
synopsis: Haskell CI script generator
55
description:
66
Script generator (@haskell-ci@) for

‎src/HaskellCI/Config/History.hs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,14 @@ configHistory =
5454
& field @"cfgVersionMapping" .~ Map.singleton (mkVersion [9,12,1]) (mkVersion [9,12,0,20241128])
5555
, ver 0 19 20241218 := \cfg -> cfg
5656
& field @"cfgCabalInstallVersion" ?~ C.mkVersion [3,15,0,0,2024,10,3]
57+
, ver 0 19 20241202 := \cfg -> cfg
58+
& field @"cfgVersionMapping" .~ mempty
59+
& field @"cfgSetupMethods" .~ PerSetupMethod
60+
{ hvrPpa = C.noVersion
61+
, ghcup = invertVersionRange (C.withinVersion (C.mkVersion [9,8,3]))
62+
, ghcupVanilla = C.withinVersion (C.mkVersion [9,8,3])
63+
, ghcupPrerelease = C.noVersion
64+
}
5765
]
5866
where
5967
ver x y z = [x, y, z]

0 commit comments

Comments
 (0)