Skip to content

Commit dbddea0

Browse files
.github: run on ubuntu-24.04
The ubuntu-20.04 runners have been deprecated and disabled.
1 parent 9dacfdb commit dbddea0

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 8 additions & 8 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.19.20241121
11+
# version: 0.19.20250330
1212
#
13-
# REGENDATA ("0.19.20241121",["--branches","master","--github-patches",".github/workflows/ci-skip-package-map.patch","--doctest","--doctest-options=-i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","--doctest-jobs=>= 8.8 && < 9.4","github","cabal.project"])
13+
# REGENDATA ("0.19.20250330",["--branches","master","--github-patches",".github/workflows/ci-skip-package-map.patch","--doctest","--doctest-options=-i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","--doctest-jobs=>= 8.8 && < 9.4","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -76,12 +76,12 @@ jobs:
7676
- name: Install GHCup
7777
run: |
7878
mkdir -p "$HOME/.ghcup/bin"
79-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
79+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
8080
chmod a+x "$HOME/.ghcup/bin/ghcup"
8181
- name: Install cabal-install
8282
run: |
83-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
84-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
83+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false)
84+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV"
8585
- name: Install GHC (GHCup)
8686
if: matrix.setup-method == 'ghcup'
8787
run: |
@@ -164,7 +164,7 @@ jobs:
164164
- name: cache (tools)
165165
uses: actions/cache/restore@v4
166166
with:
167-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-fb82843d
167+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-16fa4f55
168168
path: ~/.haskell-ci-tools
169169
- name: install cabal-plan
170170
run: |
@@ -183,7 +183,7 @@ jobs:
183183
if: always()
184184
uses: actions/cache/save@v4
185185
with:
186-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-fb82843d
186+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-16fa4f55
187187
path: ~/.haskell-ci-tools
188188
- name: checkout
189189
uses: actions/checkout@v4

hackage-db/hackage-db.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ extra-doc-files: README.md
2020

2121
source-repository head
2222
type: git
23-
location: git://github.com/NixOS/cabal2nix.git
23+
location: https://github.com/NixOS/cabal2nix.git
2424
subdir: hackage-db
2525

2626
flag install-examples

0 commit comments

Comments
 (0)