Skip to content

Commit 6dfbf51

Browse files
github-actions[bot]liskin
github-actions[bot]
authored and
liskin
committed
ci: Regenerate haskell-ci
1 parent 4d26091 commit 6dfbf51

File tree

2 files changed

+31
-56
lines changed

2 files changed

+31
-56
lines changed

‎.github/workflows/haskell-ci-hackage.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ set in GitHub repository secrets.
4242
setup-method: ghcup
4343
allow-failure: false
4444
+ upload: true
45-
- compiler: ghc-9.6.4
45+
- compiler: ghc-9.6.5
4646
compilerKind: ghc
47-
compilerVersion: 9.6.4
47+
compilerVersion: 9.6.5
4848
@@ -257,6 +265,10 @@
4949
- name: haddock
5050
run: |

‎.github/workflows/haskell-ci.yml

+29-54
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.20240316
11+
# version: 0.19.20240501
1212
#
13-
# REGENDATA ("0.19.20240316",["github","cabal.project"])
13+
# REGENDATA ("0.19.20240501",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -30,7 +30,7 @@ jobs:
3030
timeout-minutes:
3131
60
3232
container:
33-
image: buildpack-deps:bionic
33+
image: buildpack-deps:jammy
3434
continue-on-error: ${{ matrix.allow-failure }}
3535
strategy:
3636
matrix:
@@ -41,9 +41,9 @@ jobs:
4141
setup-method: ghcup
4242
allow-failure: false
4343
upload: true
44-
- compiler: ghc-9.6.4
44+
- compiler: ghc-9.6.5
4545
compilerKind: ghc
46-
compilerVersion: 9.6.4
46+
compilerVersion: 9.6.5
4747
setup-method: ghcup
4848
allow-failure: false
4949
- compiler: ghc-9.4.8
@@ -69,58 +69,42 @@ jobs:
6969
- compiler: ghc-8.8.4
7070
compilerKind: ghc
7171
compilerVersion: 8.8.4
72-
setup-method: hvr-ppa
72+
setup-method: ghcup
7373
allow-failure: false
7474
- compiler: ghc-8.6.5
7575
compilerKind: ghc
7676
compilerVersion: 8.6.5
77-
setup-method: hvr-ppa
77+
setup-method: ghcup
7878
allow-failure: false
7979
- compiler: ghc-8.4.4
8080
compilerKind: ghc
8181
compilerVersion: 8.4.4
82-
setup-method: hvr-ppa
82+
setup-method: ghcup
8383
allow-failure: false
8484
- compiler: ghc-8.2.2
8585
compilerKind: ghc
8686
compilerVersion: 8.2.2
87-
setup-method: hvr-ppa
87+
setup-method: ghcup
8888
allow-failure: false
8989
- compiler: ghc-8.0.2
9090
compilerKind: ghc
9191
compilerVersion: 8.0.2
92-
setup-method: hvr-ppa
93-
allow-failure: false
94-
- compiler: ghc-7.10.3
95-
compilerKind: ghc
96-
compilerVersion: 7.10.3
97-
setup-method: hvr-ppa
92+
setup-method: ghcup
9893
allow-failure: false
9994
fail-fast: false
10095
steps:
10196
- name: apt
10297
run: |
10398
apt-get update
104-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
105-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
106-
mkdir -p "$HOME/.ghcup/bin"
107-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
108-
chmod a+x "$HOME/.ghcup/bin/ghcup"
109-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
110-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
111-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
112-
apt-get update
113-
apt-get install -y libx11-dev libxext-dev libxinerama-dev libxrandr-dev libxss-dev
114-
else
115-
apt-add-repository -y 'ppa:hvr/ghc'
116-
apt-get update
117-
apt-get install -y "$HCNAME" libx11-dev libxext-dev libxinerama-dev libxrandr-dev libxss-dev
118-
mkdir -p "$HOME/.ghcup/bin"
119-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
120-
chmod a+x "$HOME/.ghcup/bin/ghcup"
121-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
122-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
123-
fi
99+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
100+
mkdir -p "$HOME/.ghcup/bin"
101+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
102+
chmod a+x "$HOME/.ghcup/bin/ghcup"
103+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
104+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
apt-get update
107+
apt-get install -y libx11-dev libxext-dev libxinerama-dev libxrandr-dev libxss-dev
124108
env:
125109
HCKIND: ${{ matrix.compilerKind }}
126110
HCNAME: ${{ matrix.compiler }}
@@ -132,22 +116,13 @@ jobs:
132116
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
133117
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
134118
HCDIR=/opt/$HCKIND/$HCVER
135-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
136-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
137-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
138-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
139-
echo "HC=$HC" >> "$GITHUB_ENV"
140-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
141-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
142-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
143-
else
144-
HC=$HCDIR/bin/$HCKIND
145-
echo "HC=$HC" >> "$GITHUB_ENV"
146-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
147-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
148-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
149-
fi
150-
119+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
120+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
121+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
122+
echo "HC=$HC" >> "$GITHUB_ENV"
123+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
124+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
125+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
151126
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
152127
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
153128
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -204,7 +179,7 @@ jobs:
204179
chmod a+x $HOME/.cabal/bin/cabal-plan
205180
cabal-plan --version
206181
- name: checkout
207-
uses: actions/checkout@v3
182+
uses: actions/checkout@v4
208183
with:
209184
path: source
210185
- name: autoreconf
@@ -245,7 +220,7 @@ jobs:
245220
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
246221
cabal-plan
247222
- name: restore cache
248-
uses: actions/cache/restore@v3
223+
uses: actions/cache/restore@v4
249224
with:
250225
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
251226
path: ~/.cabal/store
@@ -276,7 +251,7 @@ jobs:
276251
rm -f cabal.project.local
277252
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
278253
- name: save cache
279-
uses: actions/cache/save@v3
254+
uses: actions/cache/save@v4
280255
if: always()
281256
with:
282257
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

0 commit comments

Comments
 (0)