From a7436c138167d9c1ce7eb271da67bd3282e611b8 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Thu, 4 Jul 2024 11:34:51 +0200 Subject: [PATCH] Bump CI to GHC 9.10.1; add Stack CI --- .github/workflows/haskell-ci.yml | 32 +++--------- .github/workflows/mac-win-ci.yml | 3 +- .github/workflows/stack.yml | 87 ++++++++++++++++++++++++++++++++ shelly.cabal | 2 +- stack.yaml | 5 +- stack.yaml.lock | 12 ----- 6 files changed, 100 insertions(+), 41 deletions(-) create mode 100644 .github/workflows/stack.yml delete mode 100644 stack.yaml.lock diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 8721fec..f1a306b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/andreasabel/haskell-ci # -# version: 0.19.20240429 +# version: 0.19.20240703 # -# REGENDATA ("0.19.20240429",["github","shelly.cabal"]) +# REGENDATA ("0.19.20240703",["github","shelly.cabal"]) # name: Haskell-CI on: @@ -32,9 +32,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.10.0.20240426 + - compiler: ghc-9.10.1 compilerKind: ghc - compilerVersion: 9.10.0.20240426 + compilerVersion: 9.10.1 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.2 @@ -96,9 +96,8 @@ jobs: 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.3.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) env: HCKIND: ${{ matrix.compilerKind }} HCNAME: ${{ matrix.compiler }} @@ -116,12 +115,12 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.3.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.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=--enable-tests" >> "$GITHUB_ENV" echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - if [ $((HCNUMVER >= 91000)) -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: @@ -150,18 +149,6 @@ jobs: repository hackage.haskell.org url: http://hackage.haskell.org/ EOF - if $HEADHACKAGE; then - cat >> $CABAL_CONFIG <> $CABAL_CONFIG <> cabal.project cat >> cabal.project <> cabal.project - fi - $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(shelly)$/; }' >> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(shelly)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/.github/workflows/mac-win-ci.yml b/.github/workflows/mac-win-ci.yml index d62f990..48c487f 100644 --- a/.github/workflows/mac-win-ci.yml +++ b/.github/workflows/mac-win-ci.yml @@ -9,7 +9,7 @@ on: jobs: cabal: - name: Haskell-CI - ${{ matrix.os }} - GHC ${{ matrix.ghc }} + name: ${{ matrix.os }} - GHC ${{ matrix.ghc }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -19,6 +19,7 @@ jobs: - '9.4' - '9.6' - '9.8' + - '9.10' fail-fast: false # 2021-11-14 diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml new file mode 100644 index 0000000..70c86ff --- /dev/null +++ b/.github/workflows/stack.yml @@ -0,0 +1,87 @@ +name: Stack build + +on: + push: + branches: + - master + pull_request: + branches: + - master + +defaults: + run: + shell: bash + +jobs: + stack: + name: ${{ matrix.os }} Stack ${{ matrix.plan.resolver }} / ${{ matrix.plan.ghc }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + plan: + - ghc: '9.8.2' + resolver: 'nightly-2024-07-02' + - ghc: '9.6.5' + resolver: 'lts-22.27' + - ghc: '9.4.8' + resolver: 'lts-21.25' + - ghc: '9.2.8' + resolver: 'lts-20.26' + - ghc: '9.0.2' + resolver: 'lts-19.33' + - ghc: '8.10.7' + resolver: 'lts-18.28' + # LTS 16.31 (GHC 8.8) and below do not have recent enough async + + include: + - os: windows-latest + plan: + ghc: '9.8.2' + resolver: 'nightly-2024-07-02' + + - os: macos-latest + plan: + ghc: '9.8.2' + resolver: 'nightly-2024-07-02' + + runs-on: ${{ matrix.os }} + env: + STACK: stack --system-ghc --no-terminal --resolver ${{ matrix.plan.resolver }} + + steps: + - uses: actions/checkout@v4 + + - uses: haskell-actions/setup@latest + id: setup + with: + ghc-version: ${{ matrix.plan.ghc }} + enable-stack: true + cabal-update: false + + - uses: actions/cache/restore@v4 + id: cache + env: + key: ${{ runner.os }}-stack-${{ steps.setup.outputs.stack-version }}-ghc-${{ steps.setup.outputs.ghc-version }} + with: + path: ${{ steps.setup.outputs.stack-root }} + key: ${{ env.key }}-${{ github.sha }} + restore-keys: ${{ env.key }}- + + - name: Configure + run: $STACK init --force + + - name: Install dependencies + run: $STACK test --only-dependencies + + - name: Build + run: $STACK test --haddock --no-haddock-deps --no-run-tests + + - name: Test + run: $STACK -j 1 test --haddock --no-haddock-deps + + - uses: actions/cache/save@v4 + if: always() && steps.cache.outputs.cache-hit != 'true' + with: + path: ${{ steps.setup.outputs.stack-root }} + key: ${{ steps.cache.outputs.cache-primary-key }} diff --git a/shelly.cabal b/shelly.cabal index 2d5d310..cbb6855 100644 --- a/shelly.cabal +++ b/shelly.cabal @@ -31,7 +31,7 @@ Category: Development Build-type: Simple tested-with: - GHC == 9.10.0 + GHC == 9.10.1 GHC == 9.8.2 GHC == 9.6.5 GHC == 9.4.8 diff --git a/stack.yaml b/stack.yaml index 829e86c..a8334cc 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,6 +1,5 @@ -flags: {} +resolver: lts-21.25 + packages: - '.' - shelly-extra/ -resolver: lts-20.04 -extra-deps: [] diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index 7d9790a..0000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,12 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: [] -snapshots: -- completed: - sha256: 3770dfd79f5aed67acdcc65c4e7730adddffe6dba79ea723cfb0918356fc0f94 - size: 648660 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/4.yaml - original: lts-20.4