diff --git a/.github/haskell-ci.patch b/.github/haskell-ci.patch index c451df30df..90ed6b8c3b 100644 --- a/.github/haskell-ci.patch +++ b/.github/haskell-ci.patch @@ -18,6 +18,6 @@ + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" - jobs: - linux: - name: Haskell-CI - Linux - ${{ matrix.compiler }} + merge_group: + branches: + - master diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f94895cd42..0233141a31 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20260209 +# version: 0.19.20260624 # -# REGENDATA ("0.19.20260209",["github","--no-cabal-check","agda-stdlib-utils.cabal"]) +# REGENDATA ("0.19.20260624",["github","--no-cabal-check","agda-stdlib-utils.cabal"]) # name: Haskell-CI on: @@ -18,10 +18,20 @@ on: branches: - master - experimental + paths: + - .github/workflows/haskell-ci.yml + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" pull_request: branches: - master - experimental + paths: + - .github/workflows/haskell-ci.yml + - agda-stdlib-utils.cabal + - cabal.haskell-ci + - "*.hs" merge_group: branches: - master @@ -75,26 +85,6 @@ jobs: 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 - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: ghcup - allow-failure: false - - compiler: ghc-8.6.5 - compilerKind: ghc - compilerVersion: 8.6.5 - setup-method: ghcup - allow-failure: false fail-fast: false steps: - name: apt-get install @@ -185,7 +175,7 @@ jobs: chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version - name: checkout - uses: actions/checkout@v6 + uses: actions/checkout@v7 with: path: source - name: initial cabal.project for sdist @@ -213,8 +203,8 @@ jobs: echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package agda-stdlib-utils" >> cabal.project ; fi if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package agda-stdlib-utils" >> cabal.project ; fi - if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + echo "package agda-stdlib-utils" >> cabal.project + echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project cat >> cabal.project <> cabal.project.local @@ -225,7 +215,7 @@ jobs: $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan - name: restore cache - uses: actions/cache/restore@v5 + uses: actions/cache/restore@v6 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store @@ -249,7 +239,7 @@ jobs: $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - name: save cache if: always() - uses: actions/cache/save@v5 + uses: actions/cache/save@v6 with: key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} path: ~/.cabal/store diff --git a/agda-stdlib-utils.cabal b/agda-stdlib-utils.cabal index e4e4531d2b..721746dd6e 100644 --- a/agda-stdlib-utils.cabal +++ b/agda-stdlib-utils.cabal @@ -13,10 +13,6 @@ tested-with: GHC == 9.6.7 GHC == 9.4.8 GHC == 9.2.8 - GHC == 9.0.2 - GHC == 8.10.7 - GHC == 8.8.4 - GHC == 8.6.5 common common-build-parameters default-language: