Skip to content

Commit

Permalink
Update Haskell-CI version and GHC compiler versions
Browse files Browse the repository at this point in the history
  • Loading branch information
Bernardo Barros committed Jan 25, 2024
1 parent 2ce4690 commit 1c4ca16
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 36 deletions.
47 changes: 12 additions & 35 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.16.6
# version: 0.17.20240109
#
# REGENDATA ("0.16.6",["github","haskMus.cabal"])
# REGENDATA ("0.17.20240109",["github","haskMus.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -28,39 +28,14 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.6.2
- compiler: ghc-9.6.4
compilerKind: ghc
compilerVersion: 9.6.2
compilerVersion: 9.6.4
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.6.1
- compiler: ghc-9.4.8
compilerKind: ghc
compilerVersion: 9.6.1
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.5
compilerKind: ghc
compilerVersion: 9.4.5
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.4
compilerKind: ghc
compilerVersion: 9.4.4
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.3
compilerKind: ghc
compilerVersion: 9.4.3
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.2
compilerKind: ghc
compilerVersion: 9.4.2
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.1
compilerKind: ghc
compilerVersion: 9.4.1
compilerVersion: 9.4.8
setup-method: ghcup
allow-failure: true
fail-fast: false
Expand All @@ -86,16 +61,18 @@ jobs:
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
HCDIR=/opt/$HCKIND/$HCVER
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-2.2.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--disable-benchmarks" >> "$GITHUB_ENV"
if [ $((HCNUMVER > 90602)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
if [ $((HCNUMVER > 90604)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
Expand Down
2 changes: 1 addition & 1 deletion haskMus.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ build-type: Simple
-- extra-source-files: readme.md
-- changelog.md

tested-with: GHC >=9.4 && <9.5 || >=9.6 && <9.7
tested-with: GHC ==9.4.8 || ==9.6.4

library
hs-source-dirs: src
Expand Down

0 comments on commit 1c4ca16

Please sign in to comment.