Skip to content

Commit 061733b

Browse files
andreasabelBodigrim
authored andcommitted
CI: try centos:9 container
1 parent 6d29e0e commit 061733b

File tree

3 files changed

+10
-21
lines changed

3 files changed

+10
-21
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
os: [ubuntu-22.04, macOS-latest]
19-
ghc: ['9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
18+
os: [ubuntu-24.04, macOS-latest]
19+
ghc: ['9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
2020
exclude:
2121
- os: macos-latest
2222
ghc: '9.0'
@@ -42,7 +42,8 @@ jobs:
4242
path: |
4343
~/.cabal/store
4444
dist-newstyle
45-
key: ${{ runner.os }}-${{ matrix.ghc }}
45+
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
46+
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
4647
- name: Build
4748
run: |
4849
. ~/.ghcup/env
@@ -61,16 +62,15 @@ jobs:
6162
cabal haddock --disable-documentation
6263
6364
centos7:
64-
runs-on: ubuntu-latest
65+
runs-on: ubuntu-24.04
6566
container:
66-
image: centos:7
67+
image: centos:9
6768
steps:
6869
- name: Install
6970
run: |
7071
yum install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl autoconf
71-
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.2.8 sh
72-
- uses: actions/checkout@v3
73-
# actions/checkout@v4 (using node20) does not run on image: centos:7
72+
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.4.8 sh
73+
- uses: actions/checkout@v4
7474
- name: Test
7575
run: |
7676
source ~/.ghcup/env

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ dist-newstyle/
1616
ghc.mk
1717
include/HsUnixConfig.h
1818
include/HsUnixConfig.h.in
19+
.stack-work/
20+
stack*.yaml.lock
1921
unix.buildinfo
2022
tests/.hpc.*
2123
tests/*.eventlog

cabal.haskell-ci

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)