From 2f26dd851d8590b7f6760155ad2bbf73d32651f3 Mon Sep 17 00:00:00 2001 From: Maximilian Algehed Date: Tue, 9 Jul 2024 08:45:37 +0200 Subject: [PATCH] CI workflow to use the more flexible `setup-haskell` instead of `haskell-ci` --- .github/workflows/haskell-ci.yml | 488 ++----------------------------- .github/workflows/hugs-ci.yml | 3 +- QuickCheck.cabal | 10 +- 3 files changed, 35 insertions(+), 466 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 70af0aa5..adbb46d7 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,470 +1,46 @@ -# This GitHub workflow config has been generated by a script via -# -# haskell-ci '--config' 'cabal.haskell-ci' 'github' 'QuickCheck.cabal' -# -# To regenerate the script (for example after adjusting tested-with) run -# -# haskell-ci regenerate -# -# For more information, see https://github.com/haskell-CI/haskell-ci -# -# version: 0.19.20240316 -# -# REGENDATA ("0.19.20240316",["--config","cabal.haskell-ci","github","QuickCheck.cabal"]) -# name: Haskell-CI + on: - - push - - pull_request + push: + schedule: + - cron: 0 0 * * * + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: linux: - name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 - timeout-minutes: - 60 - container: - image: buildpack-deps:bionic - continue-on-error: ${{ matrix.allow-failure }} + name: Haskell-CI - Linux - ${{ matrix.ghc-version }} + strategy: matrix: + ghc-version: [latest, 9.10.1, 9.8.2, 9.8.1, 9.6.6, 9.6.5, 9.6.4, 9.6.3, 9.6.2, 9.6.1, 9.4.8, 9.4.7, 9.4.6, + 9.4.5, 9.4.4, 9.4.3, 9.4.2, 9.4.1, 9.2.8, 9.2.7, 9.2.6, 9.2.5, 9.2.4, 9.2.3, 9.2.2, 9.2.1, + 9.0.2, 9.0.1, 8.10.7, 8.10.6, 8.10.5, 8.10.4, 8.10.3, 8.10.2, 8.10.1, 8.8.4, 8.8.3, 8.8.2, + 8.8.1, 8.6.5, 8.6.4, 8.6.3, 8.6.2, 8.6.1, 8.4.4, 8.4.3, 8.4.2, 8.4.1, 8.2.2, 8.0.2] + os: [ubuntu-22.04] include: - - compiler: ghc-9.8.2 - compilerKind: ghc - compilerVersion: 9.8.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.8.1 - compilerKind: ghc - compilerVersion: 9.8.1 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.6.4 - compilerKind: ghc - compilerVersion: 9.6.4 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.6.3 - compilerKind: ghc - compilerVersion: 9.6.3 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.6.2 - compilerKind: ghc - compilerVersion: 9.6.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.6.1 - compilerKind: ghc - compilerVersion: 9.6.1 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.8 - compilerKind: ghc - compilerVersion: 9.4.8 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.7 - compilerKind: ghc - compilerVersion: 9.4.7 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.6 - compilerKind: ghc - compilerVersion: 9.4.6 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.5 - compilerKind: ghc - compilerVersion: 9.4.5 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.4 - compilerKind: ghc - compilerVersion: 9.4.4 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.3 - compilerKind: ghc - compilerVersion: 9.4.3 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.2 - compilerKind: ghc - compilerVersion: 9.4.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.4.1 - compilerKind: ghc - compilerVersion: 9.4.1 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.8 - compilerKind: ghc - compilerVersion: 9.2.8 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.7 - compilerKind: ghc - compilerVersion: 9.2.7 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.6 - compilerKind: ghc - compilerVersion: 9.2.6 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.5 - compilerKind: ghc - compilerVersion: 9.2.5 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.4 - compilerKind: ghc - compilerVersion: 9.2.4 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.3 - compilerKind: ghc - compilerVersion: 9.2.3 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.2 - compilerKind: ghc - compilerVersion: 9.2.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.2.1 - compilerKind: ghc - compilerVersion: 9.2.1 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.0.2 - compilerKind: ghc - compilerVersion: 9.0.2 - setup-method: ghcup - allow-failure: false - - compiler: ghc-9.0.1 - compilerKind: ghc - compilerVersion: 9.0.1 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.10.7 - compilerKind: ghc - compilerVersion: 8.10.7 - setup-method: ghcup - allow-failure: false - - compiler: ghc-8.10.6 - compilerKind: ghc - compilerVersion: 8.10.6 - setup-method: ghcup - allow-failure: false - - compiler: ghc-8.10.5 - compilerKind: ghc - compilerVersion: 8.10.5 - setup-method: ghcup - allow-failure: false - - compiler: ghc-8.10.4 - compilerKind: ghc - compilerVersion: 8.10.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.10.3 - compilerKind: ghc - compilerVersion: 8.10.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.10.2 - compilerKind: ghc - compilerVersion: 8.10.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.10.1 - compilerKind: ghc - compilerVersion: 8.10.1 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.4 - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.3 - compilerKind: ghc - compilerVersion: 8.8.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.2 - compilerKind: ghc - compilerVersion: 8.8.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.1 - compilerKind: ghc - compilerVersion: 8.8.1 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.6.5 - compilerKind: ghc - compilerVersion: 8.6.5 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.6.4 - compilerKind: ghc - compilerVersion: 8.6.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.6.3 - compilerKind: ghc - compilerVersion: 8.6.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.6.2 - compilerKind: ghc - compilerVersion: 8.6.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.6.1 - compilerKind: ghc - compilerVersion: 8.6.1 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.4.4 - compilerKind: ghc - compilerVersion: 8.4.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.4.3 - compilerKind: ghc - compilerVersion: 8.4.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.4.2 - compilerKind: ghc - compilerVersion: 8.4.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.4.1 - compilerKind: ghc - compilerVersion: 8.4.1 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.2.2 - compilerKind: ghc - compilerVersion: 8.2.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.0.2 - compilerKind: ghc - compilerVersion: 8.0.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.10.3 - compilerKind: ghc - compilerVersion: 7.10.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.8.4 - compilerKind: ghc - compilerVersion: 7.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.6.3 - compilerKind: ghc - compilerVersion: 7.6.3 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.4.2 - compilerKind: ghc - compilerVersion: 7.4.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.4.1 - compilerKind: ghc - compilerVersion: 7.4.1 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.2.2 - compilerKind: ghc - compilerVersion: 7.2.2 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-7.0.4 - compilerKind: ghc - compilerVersion: 7.0.4 - setup-method: hvr-ppa - allow-failure: false + - ghc-version: 7.10.3 + os: ubuntu-20.04 fail-fast: false - steps: - - name: apt - run: | - apt-get update - apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 - if [ "${{ matrix.setup-method }}" = ghcup ]; then - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml; - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - apt-get update - apt-get install -y hugs libhugs-time-bundled - else - apt-add-repository -y 'ppa:hvr/ghc' - apt-get update - apt-get install -y "$HCNAME" hugs libhugs-time-bundled - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml; - "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - fi - env: - HCKIND: ${{ matrix.compilerKind }} - HCNAME: ${{ matrix.compiler }} - HCVER: ${{ matrix.compilerVersion }} - - name: Set PATH and environment variables - run: | - echo "$HOME/.cabal/bin" >> $GITHUB_PATH - echo "LANG=C.UTF-8" >> "$GITHUB_ENV" - echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" - echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" - HCDIR=/opt/$HCKIND/$HCVER - if [ "${{ matrix.setup-method }}" = ghcup ]; then - 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=$HCPKG" >> "$GITHUB_ENV" - echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" - else - HC=$HCDIR/bin/$HCKIND - echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" - echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" - fi - 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=--enable-tests" >> "$GITHUB_ENV" - echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - echo "HEADHACKAGE=false" >> "$GITHUB_ENV" - echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" - echo "GHCJSARITH=0" >> "$GITHUB_ENV" - env: - HCKIND: ${{ matrix.compilerKind }} - HCNAME: ${{ matrix.compiler }} - HCVER: ${{ matrix.compilerVersion }} - - name: env - run: | - env - - name: write cabal config - run: | - mkdir -p $CABAL_DIR - cat >> $CABAL_CONFIG <> $CABAL_CONFIG < cabal-plan.xz - echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - - xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan - rm -f cabal-plan.xz - chmod a+x $HOME/.cabal/bin/cabal-plan - cabal-plan --version - - name: checkout - uses: actions/checkout@v3 + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v4 + - uses: haskell-actions/setup@v2 with: - path: source - - name: initial cabal.project for sdist - run: | - touch cabal.project - echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project - cat cabal.project - - name: sdist - run: | - mkdir -p sdist - $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist - - name: unpack - run: | - mkdir -p unpacked - find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; - - name: generate cabal.project - run: | - PKGDIR_QuickCheck="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/QuickCheck-[0-9.]*')" - echo "PKGDIR_QuickCheck=${PKGDIR_QuickCheck}" >> "$GITHUB_ENV" - rm -f cabal.project cabal.project.local - touch cabal.project - touch cabal.project.local - echo "packages: ${PKGDIR_QuickCheck}" >> cabal.project - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package QuickCheck" >> cabal.project ; fi - if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi - cat >> cabal.project <> cabal.project.local - cat cabal.project - cat cabal.project.local - - name: dump install plan - run: | - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all - cabal-plan - - name: restore cache - uses: actions/cache/restore@v3 + ghc-version: ${{matrix.ghc-version}} + - uses: actions/cache/restore@v4 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + key: ${{ matrix.os }}-${{ matrix.ghc-version }}-${{ github.sha }} path: ~/.cabal/store - restore-keys: ${{ runner.os }}-${{ matrix.compiler }}- - - name: install dependencies - run: | - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all - - name: build w/o tests - run: | - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - - name: build - run: | - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - - name: tests - run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - - name: haddock - run: | - $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all - - name: unconstrained build - run: | - rm -f cabal.project.local - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - - name: save cache - uses: actions/cache/save@v3 - if: always() + restore-keys: ${{ matrix.os }}-${{ matrix.ghc-version }}- + - run: cabal build all + - run: cabal test all + - run: cabal haddock all + - uses: actions/cache/save@v4 with: - key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + key: ${{ matrix.os }}-${{ matrix.ghc-version }}-${{ github.sha }} path: ~/.cabal/store diff --git a/.github/workflows/hugs-ci.yml b/.github/workflows/hugs-ci.yml index 9496c071..621a44b3 100644 --- a/.github/workflows/hugs-ci.yml +++ b/.github/workflows/hugs-ci.yml @@ -1,7 +1,6 @@ name: Hugs-CI on: - - push - - pull_request + push: jobs: linux: name: Hugs-CI - Linux diff --git a/QuickCheck.cabal b/QuickCheck.cabal index 2f81ccf9..c6468b16 100644 --- a/QuickCheck.cabal +++ b/QuickCheck.cabal @@ -8,15 +8,9 @@ Copyright: 2000-2019 Koen Claessen, 2006-2008 Björn Bringert, 2009-2019 Nick Sm Author: Koen Claessen Maintainer: Nick Smallbone Bug-reports: https://github.com/nick8325/quickcheck/issues -Tested-with: GHC == 7.0.4 || - == 7.2.2 || - == 7.4.1 || - == 7.4.2 || - == 7.6.3 || - == 7.8.4 || - == 7.10.3 || +Tested-with: GHC == 7.10.3 || == 8.0.2 || - >= 8.2.2 && < 9.10 + >= 8.2.2 && < 9.11 Homepage: https://github.com/nick8325/quickcheck Category: Testing Synopsis: Automatic testing of Haskell programs