Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump CI to latest GHCs: 9.8.1, 9.6.3, 9.4.7 #462

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 14 additions & 27 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:/andreasabel/haskell-ci
#
# version: 0.17.20230911
# version: 0.17.20231012
#
# REGENDATA ("0.17.20230911",["github","cabal.project"])
# REGENDATA ("0.17.20231012",["github","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -34,14 +34,14 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.8.0.20230822
- compiler: ghc-9.8.1
compilerKind: ghc
compilerVersion: 9.8.0.20230822
compilerVersion: 9.8.1
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.6.2
allow-failure: false
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.6.2
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.7
Expand All @@ -67,27 +67,27 @@ jobs:
- compiler: ghc-8.8.4
compilerKind: ghc
compilerVersion: 8.8.4
setup-method: hvr-ppa
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.6.5
compilerKind: ghc
compilerVersion: 8.6.5
setup-method: hvr-ppa
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.4.4
compilerKind: ghc
compilerVersion: 8.4.4
setup-method: hvr-ppa
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.2.2
compilerKind: ghc
compilerVersion: 8.2.2
setup-method: hvr-ppa
setup-method: ghcup
allow-failure: false
- compiler: ghc-8.0.2
compilerKind: ghc
compilerVersion: 8.0.2
setup-method: hvr-ppa
setup-method: ghcup
allow-failure: false
- compiler: ghc-7.10.3
compilerKind: ghc
Expand All @@ -99,7 +99,7 @@ jobs:
- name: apt
run: |
apt-get update
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
Expand Down Expand Up @@ -177,18 +177,8 @@ jobs:
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
if $HEADHACKAGE; then
cat >> $CABAL_CONFIG <<EOF
repository head.hackage.ghc.haskell.org
url: https://ghc.gitlab.haskell.org/head.hackage/
secure: True
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
key-threshold: 3
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
EOF
fi
cat $CABAL_CONFIG
- name: versions
run: |
Expand Down Expand Up @@ -242,9 +232,6 @@ jobs:
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
EOF
if $HEADHACKAGE; then
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
fi
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(BNFC|bnfc-system-tests)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:
fail-fast: false
matrix:
# Note: check release logic below when changing the matrix!
ghc: [9.6.2, 9.4.5, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5, 8.4.4, 8.2.2]
ghc: [9.6.3, 9.4.7, 9.2.8, 9.0.2, 8.10.7, 8.8.4, 8.6.5, 8.4.4, 8.2.2]
os: [ubuntu-latest]
include:
- os: macOS-latest
ghc: 9.6.2
ghc: 9.6.3
- os: windows-latest
ghc: 9.6.2
ghc: 9.6.3


# Needed for Windows to make piping (... >> ...) and evaluation ( $(...) ) work.
Expand Down Expand Up @@ -120,15 +120,15 @@ jobs:
# Conditional to ensure this deployment is only run once per action.
if: >-
startsWith(github.ref, 'refs/tags/v')
&& matrix.ghc == '9.6.2'
&& matrix.ghc == '9.6.3'
run: |
DIST_TGZ=$(cabal sdist source | tail -1)
echo "DIST_TGZ=${DIST_TGZ}" >> "${GITHUB_ENV}"

- name: Source tarball release.
if: >-
startsWith(github.ref, 'refs/tags/v')
&& matrix.ghc == '9.6.2'
&& matrix.ghc == '9.6.3'
uses: softprops/action-gh-release@v1
with:
draft: true
Expand All @@ -140,7 +140,7 @@ jobs:
if: >-
startsWith(github.ref, 'refs/tags/v')
&& runner.os == 'Linux'
&& matrix.ghc == '9.6.2'
&& matrix.ghc == '9.6.3'
run: |
BNFC_BIN=bnfc-${BNFC_VERSION}-linux.binary
cp -p "${BNFC_EXE}" "${BNFC_BIN}"
Expand All @@ -151,7 +151,7 @@ jobs:
if: >-
startsWith(github.ref, 'refs/tags/v')
&& runner.os == 'Linux'
&& matrix.ghc == '9.6.2'
&& matrix.ghc == '9.6.3'
uses: softprops/action-gh-release@v1
with:
draft: true
Expand Down
31 changes: 31 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# This file originally taken from: https:/readthedocs/readthedocs.org/issues/10290#issuecomment-1535838000

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.11"
# You can also specify other tool versions:
# nodejs: "19"
# rust: "1.64"
# golang: "1.19"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

# If using Sphinx, optionally build your docs in additional formats such as PDF
formats:
- pdf

# # Optionally declare the Python requirements required to build your docs
# python:
# install:
# - requirements: docs/requirements.txt
8 changes: 4 additions & 4 deletions source/BNFC.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Description:

-- Support range when build with cabal
tested-with:
GHC == 9.8.0
GHC == 9.6.2
GHC == 9.8.1
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.2.8
GHC == 9.0.2
Expand All @@ -55,8 +55,8 @@ extra-source-files:
src/BNFC.cf
src/Makefile
-- Support range when build with stack
stack-9.6.2.yaml
stack-9.4.6.yaml
stack-9.6.3.yaml
stack-9.4.7.yaml
stack-9.2.8.yaml
stack-9.0.2.yaml
stack-8.10.7.yaml
Expand Down
3 changes: 3 additions & 0 deletions source/stack-9.4.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
resolver: lts-21.15
compiler: ghc-9.4.7
compiler-check: match-exact
3 changes: 3 additions & 0 deletions source/stack-9.6.3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
resolver: nightly-2023-10-09
compiler: ghc-9.6.3
compiler-check: match-exact
7 changes: 7 additions & 0 deletions stack-9.4.7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
resolver: lts-21.15
compiler: ghc-9.4.7
compiler-check: match-exact

packages:
- source
- testing
7 changes: 7 additions & 0 deletions stack-9.6.3.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
resolver: nightly-2023-10-09
compiler: ghc-9.6.3
compiler-check: match-exact

packages:
- source
- testing
4 changes: 2 additions & 2 deletions testing/bnfc-system-tests.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ build-type: Simple
cabal-version: >=1.10

tested-with:
GHC == 9.8.0
GHC == 9.6.2
GHC == 9.8.1
GHC == 9.6.3
GHC == 9.4.7
GHC == 9.2.8
GHC == 9.0.2
Expand Down
Loading