Skip to content

Commit 3a4fd05

Browse files
BodigrimBodigrim
committed
Regenerate CI
1 parent 3c20909 commit 3a4fd05

File tree

7 files changed

+41
-56
lines changed

7 files changed

+41
-56
lines changed

‎.github/workflows/arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
args: "find . -mindepth 1 -maxdepth 1 -exec rm -rf -- {} +"
2525

2626
- name: Checkout code
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828

2929
# GHC 9.2.8 is the last version available on arm32v7 at the moment.
3030
# Check https://github.com/haskell/ghcup-metadata/blob/develop/ghcup-0.0.8.yaml

‎.github/workflows/freebsd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
ghc: 9.6.4
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Run build
2525
run: |

‎.github/workflows/haskell-ci.yml

Lines changed: 32 additions & 46 deletions
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.17.20231219
11+
# version: 0.19.20240608
1212
#
13-
# REGENDATA ("0.17.20231219",["github","cabal.project"])
13+
# REGENDATA ("0.19.20240608",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,19 +23,24 @@ jobs:
2323
timeout-minutes:
2424
60
2525
container:
26-
image: buildpack-deps:bionic
26+
image: buildpack-deps:jammy
2727
continue-on-error: ${{ matrix.allow-failure }}
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.8.1
31+
- compiler: ghc-9.10.1
3232
compilerKind: ghc
33-
compilerVersion: 9.8.1
33+
compilerVersion: 9.10.1
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.6.3
36+
- compiler: ghc-9.8.2
3737
compilerKind: ghc
38-
compilerVersion: 9.6.3
38+
compilerVersion: 9.8.2
39+
setup-method: ghcup
40+
allow-failure: false
41+
- compiler: ghc-9.6.5
42+
compilerKind: ghc
43+
compilerVersion: 9.6.5
3944
setup-method: ghcup
4045
allow-failure: false
4146
- compiler: ghc-9.4.8
@@ -61,39 +66,29 @@ jobs:
6166
- compiler: ghc-8.8.4
6267
compilerKind: ghc
6368
compilerVersion: 8.8.4
64-
setup-method: hvr-ppa
69+
setup-method: ghcup
6570
allow-failure: false
6671
- compiler: ghc-8.6.5
6772
compilerKind: ghc
6873
compilerVersion: 8.6.5
69-
setup-method: hvr-ppa
74+
setup-method: ghcup
7075
allow-failure: false
7176
- compiler: ghc-8.4.4
7277
compilerKind: ghc
7378
compilerVersion: 8.4.4
74-
setup-method: hvr-ppa
79+
setup-method: ghcup
7580
allow-failure: false
7681
fail-fast: false
7782
steps:
7883
- name: apt
7984
run: |
8085
apt-get update
81-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
82-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
83-
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
85-
chmod a+x "$HOME/.ghcup/bin/ghcup"
86-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
87-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
88-
else
89-
apt-add-repository -y 'ppa:hvr/ghc'
90-
apt-get update
91-
apt-get install -y "$HCNAME"
92-
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
94-
chmod a+x "$HOME/.ghcup/bin/ghcup"
95-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
96-
fi
86+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
87+
mkdir -p "$HOME/.ghcup/bin"
88+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
89+
chmod a+x "$HOME/.ghcup/bin/ghcup"
90+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
91+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9792
env:
9893
HCKIND: ${{ matrix.compilerKind }}
9994
HCNAME: ${{ matrix.compiler }}
@@ -105,22 +100,13 @@ jobs:
105100
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
106101
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
107102
HCDIR=/opt/$HCKIND/$HCVER
108-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
109-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
110-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
111-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
112-
echo "HC=$HC" >> "$GITHUB_ENV"
113-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
114-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
115-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
116-
else
117-
HC=$HCDIR/bin/$HCKIND
118-
echo "HC=$HC" >> "$GITHUB_ENV"
119-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
120-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
121-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
122-
fi
123-
103+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
104+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
105+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
106+
echo "HC=$HC" >> "$GITHUB_ENV"
107+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
108+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
109+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
124110
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
125111
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
126112
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -177,7 +163,7 @@ jobs:
177163
chmod a+x $HOME/.cabal/bin/cabal-plan
178164
cabal-plan --version
179165
- name: checkout
180-
uses: actions/checkout@v3
166+
uses: actions/checkout@v4
181167
with:
182168
path: source
183169
- name: initial cabal.project for sdist
@@ -211,15 +197,15 @@ jobs:
211197
echo " ghc-options: -Werror=missing-methods" >> cabal.project
212198
cat >> cabal.project <<EOF
213199
EOF
214-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(bytestring|directory|htar|tar|unix)$/; }' >> cabal.project.local
200+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(bytestring|directory|htar|tar|unix)$/; }' >> cabal.project.local
215201
cat cabal.project
216202
cat cabal.project.local
217203
- name: dump install plan
218204
run: |
219205
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
220206
cabal-plan
221207
- name: restore cache
222-
uses: actions/cache/restore@v3
208+
uses: actions/cache/restore@v4
223209
with:
224210
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
225211
path: ~/.cabal/store
@@ -251,7 +237,7 @@ jobs:
251237
rm -f cabal.project.local
252238
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
253239
- name: save cache
254-
uses: actions/cache/save@v3
240+
uses: actions/cache/save@v4
255241
if: always()
256242
with:
257243
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

‎.github/workflows/large-files.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
build:
1212
runs-on: 'ubuntu-latest'
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: haskell-actions/setup@v2
1616
id: setup-haskell-cabal
1717
with:
1818
ghc-version: 'latest'
1919
- name: Update cabal package database
2020
run: cabal update
21-
- uses: actions/cache@v3
21+
- uses: actions/cache@v4
2222
name: Cache cabal stuff
2323
with:
2424
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}

‎.github/workflows/windows_and_macOS.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,19 @@ jobs:
1616
ghc: ['latest']
1717
fail-fast: false
1818
steps:
19-
- uses: actions/checkout@v3
20-
- uses: haskell/actions/setup@v2
19+
- uses: actions/checkout@v4
20+
- uses: haskell-actions/setup@v2
2121
id: setup-haskell-cabal
2222
with:
2323
ghc-version: ${{ matrix.ghc }}
2424
- name: Update cabal package database
2525
run: cabal update
26-
- uses: actions/cache@v3
26+
- uses: actions/cache@v4
2727
name: Cache cabal stuff
2828
with:
2929
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
3030
key: ${{ runner.os }}-${{ matrix.ghc }}
3131
# We rebuild tests several times to avoid intermittent failures on Windows
32-
# https://github.com/haskell/actions/issues/36
3332
- name: Test
3433
run: |
3534
bld() { cabal build pkg:tar:tests; }

‎htar/htar.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ description: A Command-line utility to create, extract and list the
1818
like Windows that do not come with it as standard.
1919
build-type: Simple
2020
cabal-version: 2.0
21-
tested-with: GHC==9.8.1, GHC==9.6.3, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
21+
tested-with: GHC==9.10.1, GHC==9.8.2, GHC==9.6.5, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
2222
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4
2323

2424
executable htar

‎tar.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extra-source-files:
2929
test/data/symlink.tar
3030
extra-doc-files: changelog.md
3131
README.md
32-
tested-with: GHC==9.8.1, GHC==9.6.3, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
32+
tested-with: GHC==9.10.1, GHC==9.8.2, GHC==9.6.5, GHC==9.4.8, GHC==9.2.8, GHC==9.0.2,
3333
GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4
3434

3535
source-repository head

0 commit comments

Comments
 (0)