Skip to content

Commit b9b1518

Browse files
committed
CI: Regenerate
1 parent 78cc923 commit b9b1518

File tree

1 file changed

+6
-36
lines changed

1 file changed

+6
-36
lines changed

.github/workflows/haskell-ci.yml

+6-36
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20241121
11+
# version: 0.19.20250115
1212
#
13-
# REGENDATA ("0.19.20241121",["github","vector-algorithms.cabal"])
13+
# REGENDATA ("0.19.20250115",["github","vector-algorithms.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,10 +32,10 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.0.20241114
35+
- compiler: ghc-9.12.1
3636
compilerKind: ghc
37-
compilerVersion: 9.12.0.20241114
38-
setup-method: ghcup-prerelease
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.10.1
4141
compilerKind: ghc
@@ -126,21 +126,6 @@ jobs:
126126
HCKIND: ${{ matrix.compilerKind }}
127127
HCNAME: ${{ matrix.compiler }}
128128
HCVER: ${{ matrix.compilerVersion }}
129-
- name: Install GHC (GHCup prerelease)
130-
if: matrix.setup-method == 'ghcup-prerelease'
131-
run: |
132-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
133-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
134-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
135-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
136-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
137-
echo "HC=$HC" >> "$GITHUB_ENV"
138-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
139-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
140-
env:
141-
HCKIND: ${{ matrix.compilerKind }}
142-
HCNAME: ${{ matrix.compiler }}
143-
HCVER: ${{ matrix.compilerVersion }}
144129
- name: Set PATH and environment variables
145130
run: |
146131
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -151,7 +136,7 @@ jobs:
151136
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
152137
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
153138
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
154-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
139+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
155140
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
156141
env:
157142
HCKIND: ${{ matrix.compilerKind }}
@@ -179,18 +164,6 @@ jobs:
179164
repository hackage.haskell.org
180165
url: http://hackage.haskell.org/
181166
EOF
182-
if $HEADHACKAGE; then
183-
cat >> $CABAL_CONFIG <<EOF
184-
repository head.hackage.ghc.haskell.org
185-
url: https://ghc.gitlab.haskell.org/head.hackage/
186-
secure: True
187-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
188-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
189-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
190-
key-threshold: 3
191-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
192-
EOF
193-
fi
194167
cat >> $CABAL_CONFIG <<EOF
195168
program-default-options
196169
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -242,9 +215,6 @@ jobs:
242215
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
243216
cat >> cabal.project <<EOF
244217
EOF
245-
if $HEADHACKAGE; then
246-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
247-
fi
248218
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(vector-algorithms)$/; }' >> cabal.project.local
249219
cat cabal.project
250220
cat cabal.project.local

0 commit comments

Comments
 (0)