From f3f050c156ccad3021e3eed1ec2a7452a4920f3d Mon Sep 17 00:00:00 2001
From: konsumlamm <konsumlamm@gmail.com>
Date: Tue, 12 Sep 2023 12:49:20 +0200
Subject: [PATCH] Update CI
---
.github/workflows/haskell-ci.yml | 223 +++++++++++++++++++------------
stm.cabal | 2 +-
testsuite/testsuite.cabal | 4 +-
3 files changed, 142 insertions(+), 87 deletions(-)
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index ef91687..1af6873 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -1,6 +1,6 @@
# This GitHub workflow config has been generated by a script via
#
-# haskell-ci 'github' 'stm.cabal'
+# haskell-ci 'github' 'cabal.project'
#
# To regenerate the script (for example after adjusting tested-with) run
#
@@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
-# version: 0.12.1
+# version: 0.17.20230826
#
-# REGENDATA ("0.12.1",["github","stm.cabal"])
+# REGENDATA ("0.17.20230826",["github","cabal.project"])
#
name: Haskell-CI
on:
@@ -19,116 +19,149 @@ on:
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-20.04
+ timeout-minutes:
+ 60
container:
- image: buildpack-deps:xenial
+ image: buildpack-deps:bionic
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- - compiler: ghc-8.10.4
- allow-failure: false
- - compiler: ghc-8.10.3
- allow-failure: false
- - compiler: ghc-8.10.2
- allow-failure: false
- - compiler: ghc-8.10.1
+ - compiler: ghc-9.6.2
+ compilerKind: ghc
+ compilerVersion: 9.6.2
+ 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.2.8
+ compilerKind: ghc
+ compilerVersion: 9.2.8
+ 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-8.10.7
+ compilerKind: ghc
+ compilerVersion: 8.10.7
+ setup-method: ghcup
allow-failure: false
- compiler: ghc-8.8.4
- allow-failure: false
- - compiler: ghc-8.8.3
- allow-failure: false
- - compiler: ghc-8.8.2
- allow-failure: false
- - compiler: ghc-8.8.1
+ compilerKind: ghc
+ compilerVersion: 8.8.4
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.6.5
- allow-failure: false
- - compiler: ghc-8.6.4
- allow-failure: false
- - compiler: ghc-8.6.3
- allow-failure: false
- - compiler: ghc-8.6.2
- allow-failure: false
- - compiler: ghc-8.6.1
+ compilerKind: ghc
+ compilerVersion: 8.6.5
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.4.4
- allow-failure: false
- - compiler: ghc-8.4.3
- allow-failure: false
- - compiler: ghc-8.4.2
- allow-failure: false
- - compiler: ghc-8.4.1
+ compilerKind: ghc
+ compilerVersion: 8.4.4
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.2.2
- allow-failure: false
- - compiler: ghc-8.2.1
+ compilerKind: ghc
+ compilerVersion: 8.2.2
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-8.0.2
- allow-failure: false
- - compiler: ghc-8.0.1
+ compilerKind: ghc
+ compilerVersion: 8.0.2
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.10.3
- allow-failure: false
- - compiler: ghc-7.10.2
- allow-failure: false
- - compiler: ghc-7.10.1
+ compilerKind: ghc
+ compilerVersion: 7.10.3
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.8.4
- allow-failure: false
- - compiler: ghc-7.8.3
- allow-failure: false
- - compiler: ghc-7.8.2
- allow-failure: false
- - compiler: ghc-7.8.1
+ compilerKind: ghc
+ compilerVersion: 7.8.4
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.6.3
- allow-failure: false
- - compiler: ghc-7.6.2
- allow-failure: false
- - compiler: ghc-7.6.1
+ compilerKind: ghc
+ compilerVersion: 7.6.3
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.4.2
- allow-failure: false
- - compiler: ghc-7.4.1
+ compilerKind: ghc
+ compilerVersion: 7.4.2
+ setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.2.2
- allow-failure: false
- - compiler: ghc-7.2.1
+ compilerKind: ghc
+ compilerVersion: 7.2.2
+ setup-method: hvr-ppa
allow-failure: false
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
- apt-add-repository -y 'ppa:hvr/ghc'
- apt-get update
- apt-get install -y $CC cabal-install-3.4
+ 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.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
+ chmod a+x "$HOME/.ghcup/bin/ghcup"
+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ else
+ apt-add-repository -y 'ppa:hvr/ghc'
+ apt-get update
+ apt-get install -y "$HCNAME"
+ 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"
+ chmod a+x "$HOME/.ghcup/bin/ghcup"
+ "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+ fi
env:
- CC: ${{ matrix.compiler }}
+ 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=$(echo "/opt/$CC" | sed 's/-/\//')
- HCNAME=ghc
- HC=$HCDIR/bin/$HCNAME
- echo "HC=$HC" >> $GITHUB_ENV
- echo "HCPKG=$HCDIR/bin/$HCNAME-pkg" >> $GITHUB_ENV
- echo "HADDOCK=$HCDIR/bin/haddock" >> $GITHUB_ENV
- echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
+ 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.1.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.1.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
- if [ $((HCNUMVER >= 70202)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV ; else echo "ARG_TESTS=--disable-tests" >> $GITHUB_ENV ; fi
- echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
- echo "HEADHACKAGE=false" >> $GITHUB_ENV
- echo "ARG_COMPILER=--$HCNAME --with-compiler=$HC" >> $GITHUB_ENV
- echo "GHCJSARITH=0" >> $GITHUB_ENV
+ 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:
- CC: ${{ matrix.compiler }}
+ HCKIND: ${{ matrix.compilerKind }}
+ HCNAME: ${{ matrix.compiler }}
+ HCVER: ${{ matrix.compilerVersion }}
- name: env
run: |
env
@@ -151,6 +184,10 @@ jobs:
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
+ cat >> $CABAL_CONFIG <<EOF
+ program-default-options
+ ghc-options: $GHCJOBS +RTS -M3G -RTS
+ EOF
cat $CABAL_CONFIG
- name: versions
run: |
@@ -163,20 +200,21 @@ jobs:
- name: install cabal-plan
run: |
mkdir -p $HOME/.cabal/bin
- curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz
- echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz' | sha256sum -c -
+ curl -sL https://github.com/haskell-hvr/cabal-plan/releases/download/v0.7.3.0/cabal-plan-0.7.3.0-x86_64-linux.xz > 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@v2
+ uses: actions/checkout@v3
with:
path: source
- name: initial cabal.project for sdist
run: |
touch cabal.project
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
+ echo "packages: $GITHUB_WORKSPACE/source/testsuite" >> cabal.project
cat cabal.project
- name: sdist
run: |
@@ -189,23 +227,29 @@ jobs:
- name: generate cabal.project
run: |
PKGDIR_stm="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/stm-[0-9.]*')"
- echo "PKGDIR_stm=${PKGDIR_stm}" >> $GITHUB_ENV
+ echo "PKGDIR_stm=${PKGDIR_stm}" >> "$GITHUB_ENV"
+ PKGDIR_testsuite="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/testsuite-[0-9.]*')"
+ echo "PKGDIR_testsuite=${PKGDIR_testsuite}" >> "$GITHUB_ENV"
+ rm -f cabal.project cabal.project.local
touch cabal.project
touch cabal.project.local
echo "packages: ${PKGDIR_stm}" >> cabal.project
+ echo "packages: ${PKGDIR_testsuite}" >> cabal.project
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package stm" >> cabal.project ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package testsuite" >> cabal.project ; fi
+ if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
EOF
- $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(random|stm)$/; }' >> cabal.project.local
+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(random|stm|testsuite)$/; }' >> 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: cache
- uses: actions/cache@v2
+ - name: restore cache
+ uses: actions/cache/restore@v3
with:
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
path: ~/.cabal/store
@@ -220,14 +264,25 @@ jobs:
- 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: cabal check
run: |
cd ${PKGDIR_stm} || false
${CABAL} -vnormal check
+ cd ${PKGDIR_testsuite} || false
+ ${CABAL} -vnormal check
- name: haddock
run: |
- $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+ $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()
+ with:
+ key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
+ path: ~/.cabal/store
diff --git a/stm.cabal b/stm.cabal
index 65a44fb..d1215a6 100644
--- a/stm.cabal
+++ b/stm.cabal
@@ -11,7 +11,7 @@ bug-reports: https://github.com/haskell/stm/issues
synopsis: Software Transactional Memory
category: Concurrency
build-type: Simple
-tested-with: GHC==8.10.*, GHC==8.8.*, GHC==8.6.*, GHC==8.4.*, GHC==8.2.*, GHC==8.0.*, GHC==7.10.*, GHC==7.8.*, GHC==7.6.*, GHC==7.4.*, GHC==7.2.*
+tested-with: GHC==9.6.2, GHC==9.4.7, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2
description:
Software Transactional Memory, or STM, is an abstraction for
concurrent communication. The main benefits of STM are
diff --git a/testsuite/testsuite.cabal b/testsuite/testsuite.cabal
index 7815dad..b2690ff 100644
--- a/testsuite/testsuite.cabal
+++ b/testsuite/testsuite.cabal
@@ -6,7 +6,7 @@ synopsis: External testsuite for stm package
category: Testing
license: BSD-3-Clause
maintainer: hvr@gnu.org
-tested-with: GHC==8.8.*, GHC==8.6.*, GHC==8.4.*, GHC==8.2.*, GHC==8.0.*, GHC==7.10.*, GHC==7.8.*, GHC==7.6.*, GHC==7.4.*, GHC==7.2.*, GHC==7.0.*
+tested-with: GHC==9.6.2, GHC==9.4.7, GHC==9.2.8, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2
description:
This testsuite is intended to be compatible with different versions
of `stm` (via use of @CPP@ if needed) in order to more easily
@@ -36,7 +36,7 @@ test-suite stm
--
build-depends:
- , base >= 4.3 && < 4.17
+ , base >= 4.3 && < 4.20
, test-framework ^>= 0.8.2.0
, test-framework-hunit ^>= 0.3.0.2
, HUnit ^>= 1.6.0.0
--
GitLab