diff --git a/.github/workflows/cabal-mac-win.yml b/.github/workflows/cabal-mac-win.yml index 981f212..5d0a950 100644 --- a/.github/workflows/cabal-mac-win.yml +++ b/.github/workflows/cabal-mac-win.yml @@ -4,8 +4,10 @@ on: branches: - master - ci-* - - release* pull_request: + branches: + - master + - ci-* jobs: @@ -14,11 +16,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macOS-latest, windows-2022] + os: [macOS-latest, windows-latest] ghc: - 8.10.7 - 9.0.2 - - 9.2.1 + - 9.2.4 + - 9.4.1 + # As of 2022-10-06, haskell/actions/setup does not support 9.4.2 yet. + # Waiting for https://github.com/haskell/actions/pull/115. fail-fast: false env: @@ -48,7 +53,7 @@ jobs: echo "PKG_CONFIG_PATH=/usr/local/opt/icu4c/lib/pkgconfig" >> ${GITHUB_ENV} - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Haskell uses: haskell/actions/setup@v1 @@ -61,7 +66,7 @@ jobs: cabal freeze - name: Cache ~/.cabal/store - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ${{ steps.setup-haskell-cabal.outputs.cabal-store }} diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index c3f874f..07fc49d 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,18 +8,24 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.14.1 +# version: 0.15.20220826 # -# REGENDATA ("0.14.1",["github","text-icu.cabal"]) +# REGENDATA ("0.15.20220826",["github","text-icu.cabal"]) # name: Haskell-CI on: - - push - - pull_request + push: + branches: + - master + - ci-* + pull_request: + branches: + - master + - ci-* jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 60 container: @@ -28,9 +34,14 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.2.1 + - compiler: ghc-9.4.2 compilerKind: ghc - compilerVersion: 9.2.1 + compilerVersion: 9.4.2 + 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.0.2 @@ -81,18 +92,18 @@ jobs: 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.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" - "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.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.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 + "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) fi env: HCKIND: ${{ matrix.compilerKind }} @@ -235,7 +246,7 @@ jobs: ${CABAL} -vnormal check - name: haddock run: | - $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all - name: unconstrained build run: | rm -f cabal.project.local diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 696fdac..1c58cd5 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,5 +1,10 @@ -- Recreate .github/workflows/haskell-ci.yml with command `haskell-ci regenerate`. +-- To avoid duplicate runs of this CI on PRs, +-- restrict CI to pushes and PRs on "master" and any branch starting with "ci-". +-- Use "ci-" branches if you want CI to run but do not want to open a PR yet. +branches: master ci-* + -- text-icu-0.8 requires a newer ICU lib (shipped not with Ubuntu 18.04, but with 20.04) distribution: focal diff --git a/text-icu.cabal b/text-icu.cabal index 18ba483..90f7822 100644 --- a/text-icu.cabal +++ b/text-icu.cabal @@ -59,7 +59,8 @@ tested-with: GHC == 8.8.4 GHC == 8.10.7 GHC == 9.0.2 - GHC == 9.2.1 + GHC == 9.2.4 + GHC == 9.4.2 library default-language: Haskell98