Skip to content

Commit dbf1182

Browse files
RyanGlScottRyanGlScott
committed
Require building with singletons-base-3.5/GHC 9.12
1 parent 9465135 commit dbf1182

File tree

3 files changed

+33
-24
lines changed

3 files changed

+33
-24
lines changed

‎.github/workflows/haskell-ci.yml

+23-17
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.20240514
11+
# version: 0.19.20241222
1212
#
13-
# REGENDATA ("0.19.20240514",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241222",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -28,22 +28,37 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.10.1
31+
- compiler: ghc-9.12.1
3232
compilerKind: ghc
33-
compilerVersion: 9.10.1
33+
compilerVersion: 9.12.1
3434
setup-method: ghcup
3535
allow-failure: false
3636
fail-fast: false
3737
steps:
38-
- name: apt
38+
- name: apt-get install
3939
run: |
4040
apt-get update
4141
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
42+
- name: Install GHCup
43+
run: |
4244
mkdir -p "$HOME/.ghcup/bin"
43-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
45+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
4446
chmod a+x "$HOME/.ghcup/bin/ghcup"
47+
- name: Install cabal-install (prerelease)
48+
run: |
49+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
50+
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
51+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
52+
- name: Install GHC (GHCup)
53+
if: matrix.setup-method == 'ghcup'
54+
run: |
4555
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
46-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
56+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
57+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
58+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
59+
echo "HC=$HC" >> "$GITHUB_ENV"
60+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
61+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
4762
env:
4863
HCKIND: ${{ matrix.compilerKind }}
4964
HCNAME: ${{ matrix.compiler }}
@@ -54,21 +69,12 @@ jobs:
5469
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
5570
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
5671
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
57-
HCDIR=/opt/$HCKIND/$HCVER
58-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
59-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
60-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
61-
echo "HC=$HC" >> "$GITHUB_ENV"
62-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
63-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
64-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
6572
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
6673
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
6774
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
6875
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
6976
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
7077
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
71-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
7278
env:
7379
HCKIND: ${{ matrix.compilerKind }}
7480
HCNAME: ${{ matrix.compiler }}
@@ -179,8 +185,8 @@ jobs:
179185
run: |
180186
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
181187
- name: save cache
182-
uses: actions/cache/save@v4
183188
if: always()
189+
uses: actions/cache/save@v4
184190
with:
185191
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
186192
path: ~/.cabal/store

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### next [????.??.??]
2+
* Require `singletons-base-3.5` and GHC 9.12.
3+
14
### 0.9.5 [2024.05.12]
25
* Require `singletons-base-3.4` and GHC 9.10.
36

‎eliminators.cabal

+7-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ category: Dependent Types
1616
build-type: Simple
1717
extra-source-files: CHANGELOG.md, README.md
1818
cabal-version: >=1.10
19-
tested-with: GHC == 9.10.1
19+
tested-with: GHC == 9.12.1
2020

2121
source-repository head
2222
type: git
@@ -30,14 +30,14 @@ library
3030
Data.Eliminator.TH
3131
Data.Eliminator.TypeLits
3232
Data.Eliminator.TypeNats
33-
build-depends: base >= 4.20 && < 4.21
33+
build-depends: base >= 4.21 && < 4.22
3434
, extra >= 1.4.2 && < 1.9
35-
, singletons-base >= 3.4 && < 3.5
35+
, singletons-base >= 3.5 && < 3.6
3636
, singleton-nats >= 0.4.2 && < 0.5
37-
, template-haskell >= 2.22 && < 2.23
37+
, template-haskell >= 2.23 && < 2.24
3838
, text >= 2.0.1 && < 2.2
3939
, th-abstraction >= 0.4 && < 0.8
40-
, th-desugar >= 1.17 && < 1.18
40+
, th-desugar >= 1.18 && < 1.19
4141
hs-source-dirs: src
4242
default-language: GHC2021
4343
ghc-options: -Wall -Wcompat -Wno-unticked-promoted-constructors -fenable-th-splice-warnings
@@ -58,10 +58,10 @@ test-suite spec
5858
PolyRecTypes
5959
VecTypes
6060
VecSpec
61-
build-depends: base >= 4.20 && < 4.21
61+
build-depends: base >= 4.21 && < 4.22
6262
, eliminators
6363
, hspec >= 2 && < 3
64-
, singletons-base >= 3.4 && < 3.5
64+
, singletons-base >= 3.5 && < 3.6
6565
, singleton-nats >= 0.4.2 && < 0.5
6666
build-tool-depends: hspec-discover:hspec-discover
6767
hs-source-dirs: tests

0 commit comments

Comments
 (0)