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

Support ghc 9.10 #39

Merged
merged 3 commits into from
Jun 25, 2024
Merged
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
117 changes: 27 additions & 90 deletions .github/workflows/packcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,57 +24,22 @@ jobs:
build:
name: ${{ matrix.name }}
env:
# ------------------------------------------------------------------------
# Common options
# ------------------------------------------------------------------------
# GHC_OPTIONS: "-Werror"
# Env
CABAL_REINIT_CONFIG: y
LC_ALL: C.UTF-8

# ------------------------------------------------------------------------
# What to build
# ------------------------------------------------------------------------
# DISABLE_TEST: "y"
# DISABLE_BENCH: "y"
# DISABLE_DOCS: "y"
# DISABLE_SDIST_BUILD: "y"
# DISABLE_SDIST_GIT_CHECK: "y"
# DISABLE_DIST_CHECKS: "y"

# ------------------------------------------------------------------------
# stack options
# ------------------------------------------------------------------------
# Note requiring a specific version of stack using STACKVER may fail due to
# github API limit while checking and upgrading/downgrading to the specific
# version.
#STACKVER: "1.6.5"
#STACK_UPGRADE: "y"
#RESOLVER: "lts-12"

# ------------------------------------------------------------------------
# cabal options
# ------------------------------------------------------------------------
# Ghcup and Cabal
GHCUP_VERSION: 0.1.20.0
CABAL_CHECK_RELAX: y
CABAL_HACKAGE_MIRROR: "hackage.haskell.org:http://hackage.fpcomplete.com"

# ------------------------------------------------------------------------
# Where to find the required tools
# ------------------------------------------------------------------------
PATH: /opt/ghc/bin:/sbin:/usr/sbin:/bin:/usr/bin
#TOOLS_DIR: /opt
GHCVER: ${{ matrix.ghc_version }}
CABALVER: ${{ matrix.cabal_version }}

# ------------------------------------------------------------------------
# Location of packcheck.sh (the shell script invoked to perform CI tests ).
# ------------------------------------------------------------------------
# You can either commit the packcheck.sh script at this path in your repo or
# you can use it by specifying the PACKCHECK_REPO_URL option below in which
# case it will be automatically copied from the packcheck repo to this path
# during CI tests. In any case it is finally invoked from this path.
# Packcheck
PACKCHECK: "./packcheck.sh"
# If you have not committed packcheck.sh in your repo at PACKCHECK
# then it is automatically pulled from this URL.
PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"
PACKCHECK_GITHUB_COMMIT: "v0.7.0"
PACKCHECK_GITHUB_COMMIT: "101c73b53473ddfb763d65058b80123991cfeb4f"

# ------------------------------------------------------------------------
# Final build variables
Expand All @@ -88,58 +53,13 @@ jobs:

include:

- name: 8.4.4
ghc_version: 8.4.4
runner: ubuntu-latest
cabal_version: 3.2
command: cabal-v2

- name: 8.6.5
ghc_version: 8.6.5
runner: ubuntu-latest
cabal_version: 3.2
command: cabal-v2

- name: 8.8.4
ghc_version: 8.8.4
runner: ubuntu-latest
cabal_version: 3.2
command: cabal-v2

- name: 8.10.7
ghc_version: 8.10.7
runner: ubuntu-latest
cabal_version: 3.2
command: cabal-v2

- name: 8.10.7+no-charts
ghc_version: 8.10.7
runner: ubuntu-latest
cabal_version: 3.2
command: cabal-v2
pack_options: >-
CABAL_BUILD_OPTIONS="-f no-charts"
DISABLE_TEST=y

- name: 8.10.7+no-colors
ghc_version: 8.10.7
runner: ubuntu-latest
cabal_version: 3.2
command: cabal-v2
pack_options: >-
CABAL_BUILD_OPTIONS="-f no-colors"

- name: 9.0.1
ghc_version: 9.0.1
runner: ubuntu-latest
cabal_version: 3.2
command: cabal-v2

- name: 9.2.8
- name: 9.2.8+no-colors
ghc_version: 9.2.8
runner: ubuntu-latest
cabal_version: 3.10.2.1
command: cabal
pack_options: >-
CABAL_BUILD_OPTIONS="-f no-colors"

- name: 9.4.8
ghc_version: 9.4.8
Expand All @@ -159,6 +79,23 @@ jobs:
cabal_version: 3.10.2.1
command: cabal

- name: 9.10.1+no-charts
ghc_version: 9.10.1
runner: ubuntu-latest
cabal_version: 3.10.2.1
command: cabal
pack_options: >-
CABAL_BUILD_OPTIONS="-f no-charts"
DISABLE_TEST=y

- name: 9.10.1+allow-newer
ghc_version: 9.10.1
runner: ubuntu-latest
cabal_version: 3.10.2.1
command: cabal
pack_options: >-
CABAL_BUILD_OPTIONS="--allow-newer=lens,base"

# - name: hlint
# command: cabal-v2
# runner: ubuntu-latest
Expand Down
13 changes: 4 additions & 9 deletions bench-show.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,7 @@ description:
category: Performance, Benchmarking
homepage: https://github.com/composewell/bench-show
license-file: LICENSE
tested-with: GHC==8.4.4
, GHC==8.6.5
, GHC==8.8.4
, GHC==8.10.7
, GHC==9.0.1
, GHC==9.2.8
tested-with: GHC==9.2.8
, GHC==9.4.8
, GHC==9.6.4
, GHC==9.8.1
Expand Down Expand Up @@ -153,7 +148,7 @@ executable bench-show
other-modules: Paths_bench_show
ghc-options: -Wall
build-depends:
base >= 4.8 && < 4.20
base >= 4.8 && < 4.21
, optparse-applicative >= 0.14.2 && < 0.19
, optparse-simple >= 0.1.0 && < 0.2
, bench-show
Expand All @@ -174,7 +169,7 @@ test-suite test

build-depends:
bench-show
, base >= 4.8 && < 4.20
, base >= 4.8 && < 4.21
, split >= 0.2 && < 0.3
, text >= 1.1.1 && < 2.2
-- , typed-process >= 0.1.0.0 && < 0.3
Expand All @@ -193,5 +188,5 @@ test-suite doc

build-depends:
bench-show
, base >= 4.8 && < 4.20
, base >= 4.8 && < 4.21
, split >= 0.2 && < 0.3
Loading