Skip to content

Commit fd82c1b

Browse files
authored
Bump CI to latest ubuntu and latest GHC minor versions (#95)
1 parent 90f8255 commit fd82c1b

File tree

3 files changed

+22
-34
lines changed

3 files changed

+22
-34
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
os: ["macOS-latest", "windows-latest", "ubuntu-22.04"]
20-
resolver: ["lts-20.17"]
19+
os: ["macOS-latest", "windows-latest", "ubuntu-24.04"]
20+
resolver: ["lts-22.44"]
2121
fail-fast: false
2222
steps:
2323
- name: Checkout
2424
uses: actions/checkout@v4
2525

2626
- name: Setup Haskell
27-
uses: haskell-actions/setup@v2.7.0
27+
uses: haskell-actions/setup@v2.8.0
2828
id: setup-haskell
2929
with:
3030
enable-stack: true
@@ -61,26 +61,24 @@ jobs:
6161
runs-on: ${{ matrix.os }}
6262
strategy:
6363
matrix:
64-
os: ["macOS-latest", "windows-latest", "ubuntu-22.04"]
64+
os: ["macOS-latest", "windows-latest", "ubuntu-24.04"]
6565
ghc:
66-
- "9.12.1"
67-
- "9.10.1"
68-
- "9.8.1"
69-
- "9.6.3"
70-
- "9.4.7"
66+
- "9.12.2"
67+
- "9.10.2"
68+
- "9.8.4"
69+
- "9.6.7"
70+
- "9.4.8"
7171
- "9.2.8"
7272
- "9.0.2"
7373
exclude:
7474
# Newer macOSs don't have the right LLVM to compile our dependencies
7575
- os: macOS-latest
7676
ghc: "9.0.2"
77-
- os: macOS-latest
78-
ghc: "8.10.7"
7977

8078
# Uncomment if testing with an unreleased GHC. Make sure to edit the
8179
# "Setup Haskell (head)" step too.
8280
# include:
83-
# - os: ubuntu-22.04
81+
# - os: ubuntu-24.04
8482
# ghc: head
8583
fail-fast: false
8684
steps:
@@ -89,7 +87,7 @@ jobs:
8987

9088
- name: Setup Haskell
9189
if: matrix.ghc != 'head'
92-
uses: haskell-actions/setup@v2.7.0
90+
uses: haskell-actions/setup@v2.8.0
9391
id: setup-haskell
9492
with:
9593
ghc-version: ${{ matrix.ghc }}
@@ -147,10 +145,10 @@ jobs:
147145
cabal v2-run doctests
148146
149147
nix:
150-
runs-on: ubuntu-22.04
148+
runs-on: ubuntu-24.04
151149
steps:
152150
- uses: actions/checkout@v4
153-
- uses: cachix/install-nix-action@v26
151+
- uses: cachix/install-nix-action@v31
154152
with:
155153
nix_path: nixpkgs=channel:nixos-unstable
156154
- run: |
@@ -165,11 +163,11 @@ jobs:
165163
166164
hls:
167165
name: HLS
168-
runs-on: ubuntu-22.04
166+
runs-on: ubuntu-24.04
169167
strategy:
170168
matrix:
171169
tools:
172-
- {ghc: "9.6.2", cabal: "3.10.1.0", hls: "2.0.0.1", ghcup: "0.1.19.4"}
170+
- {ghc: "9.10.2", cabal: "3.12.1.0", hls: "2.9.0.1", ghcup: "0.1.50.2"}
173171
steps:
174172
- name: Checkout
175173
uses: actions/checkout@v4
@@ -180,7 +178,7 @@ jobs:
180178
sudo apt-get install curl -y
181179
sudo apt-get install \
182180
build-essential curl libffi-dev libffi8ubuntu1 libgmp-dev \
183-
libgmp10 libncurses-dev libncurses5 libtinfo5 -y
181+
libgmp10 libncurses-dev libncurses6 libtinfo6 -y
184182
185183
sudo curl "https://downloads.haskell.org/~ghcup/${{ matrix.tools.ghcup }}/x86_64-linux-ghcup-${{ matrix.tools.ghcup }}" --output /usr/bin/ghcup
186184
sudo chmod +x /usr/bin/ghcup
@@ -228,7 +226,7 @@ jobs:
228226
nix,
229227
hls,
230228
]
231-
runs-on: ubuntu-22.04
229+
runs-on: ubuntu-24.04
232230
steps:
233231
- name: Checkout
234232
uses: actions/checkout@v4

cabal.project

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,5 @@ write-ghc-environment-files: always
55

66
tests: true
77

8-
source-repository-package
9-
type: git
10-
location: https://github.com/haskell-unordered-containers/unordered-containers.git
11-
tag: d52a0fd10bfa701cbbc9d7ac06bd7eb7664b3972
12-
13-
allow-newer:
14-
unordered-containers:template-haskell,
15-
splitmix:base,
16-
hashable:base,
17-
188
package doctest-parallel
199
ghc-options: +RTS -qn4 -A128M -RTS -j4

doctest-parallel.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ build-type: Simple
1919
tested-with:
2020
GHC == 9.0.2
2121
, GHC == 9.2.8
22-
, GHC == 9.4.7
23-
, GHC == 9.6.3
24-
, GHC == 9.8.1
25-
, GHC == 9.10.1
26-
, GHC == 9.12.1
22+
, GHC == 9.4.8
23+
, GHC == 9.6.7
24+
, GHC == 9.8.4
25+
, GHC == 9.10.2
26+
, GHC == 9.12.2
2727

2828
extra-source-files:
2929
example/example.cabal

0 commit comments

Comments
 (0)