From c23df3ddd2559439d52f0a972d7ff8ae6864a57c Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 7 Oct 2025 06:48:35 +0200 Subject: [PATCH 1/2] Update stack.yaml files to latest minor versions --- stack-8.10.5.yaml | 10 ---------- stack-9.4.5.yaml | 6 ------ stack-8.8.2.yaml => stack-9.4.8.yaml | 4 ++-- stack-9.6.2.yaml | 6 ------ stack-8.8.3.yaml => stack-9.6.7.yaml | 4 ++-- 5 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 stack-8.10.5.yaml delete mode 100644 stack-9.4.5.yaml rename stack-8.8.2.yaml => stack-9.4.8.yaml (52%) delete mode 100644 stack-9.6.2.yaml rename stack-8.8.3.yaml => stack-9.6.7.yaml (52%) diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml deleted file mode 100644 index 60837109bc..0000000000 --- a/stack-8.10.5.yaml +++ /dev/null @@ -1,10 +0,0 @@ -resolver: lts-18.0 -compiler: ghc-8.10.5 -compiler-check: match-exact - -# extra-deps: -# - filemanip-0.3.6.3 -# - unix-compat-0.5.2 - -packages: -- '.' diff --git a/stack-9.4.5.yaml b/stack-9.4.5.yaml deleted file mode 100644 index 790630b2e2..0000000000 --- a/stack-9.4.5.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: lts-21.7 -compiler: ghc-9.4.5 -compiler-check: match-exact - -packages: -- '.' diff --git a/stack-8.8.2.yaml b/stack-9.4.8.yaml similarity index 52% rename from stack-8.8.2.yaml rename to stack-9.4.8.yaml index b47170ce6d..e6d7eb5f1a 100644 --- a/stack-8.8.2.yaml +++ b/stack-9.4.8.yaml @@ -1,5 +1,5 @@ -resolver: lts-15.3 -compiler: ghc-8.8.2 +resolver: lts-21.25 +compiler: ghc-9.4.8 compiler-check: match-exact packages: diff --git a/stack-9.6.2.yaml b/stack-9.6.2.yaml deleted file mode 100644 index dab6c80ebf..0000000000 --- a/stack-9.6.2.yaml +++ /dev/null @@ -1,6 +0,0 @@ -resolver: nightly-2023-08-27 -compiler: ghc-9.6.2 -compiler-check: match-exact - -packages: -- '.' diff --git a/stack-8.8.3.yaml b/stack-9.6.7.yaml similarity index 52% rename from stack-8.8.3.yaml rename to stack-9.6.7.yaml index ecb2212378..403d4da58e 100644 --- a/stack-8.8.3.yaml +++ b/stack-9.6.7.yaml @@ -1,5 +1,5 @@ -resolver: lts-16.5 -compiler: ghc-8.8.3 +resolver: lts-22.44 +compiler: ghc-9.6.7 compiler-check: match-exact packages: From a53bce8c36a8622677cb164ecd3d57044f197889 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Tue, 7 Oct 2025 07:01:34 +0200 Subject: [PATCH 2/2] Update CI to Agda-2.8.0 and GHC-9.12.2 (shipped with ubuntu-24.04) --- .github/workflows/ci-ubuntu.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index 0a421f0ae7..3020af8754 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -48,8 +48,8 @@ on: ######################################################################## env: - GHC_VERSION: 9.10.1 - CABAL_VERSION: 3.12.1.0 + GHC_VERSION: 9.12.2 + CABAL_VERSION: 3.16.0.0 CABAL_V1_INSTALL: cabal v1-install --ghc-options='-O1 +RTS -M6G -RTS' CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS' AGDA: agda -Werror +RTS -M5G -H3.5G -A128M -RTS -i. -isrc -idoc @@ -76,11 +76,12 @@ jobs: if [[ '${{ github.ref }}' == 'refs/heads/experimental' \ || '${{ github.base_ref }}' == 'experimental' ]]; then # Pick Agda version for experimental - echo "AGDA_COMMIT=ef912c68fd329ad3046d156e3c1a70a7fec19ba1" >> "${GITHUB_ENV}"; + echo "AGDA_COMMIT=3d04bacca842729f9c0869b9287256321b5f450f" >> "${GITHUB_ENV}"; + # Andreas, 2025-10-07: 3d04bacca842729f9c0869b9287256321b5f450f is tags/v2.8.0 echo "AGDA_HTML_DIR=html/experimental" >> "${GITHUB_ENV}" else # Pick Agda version for master - echo "AGDA_COMMIT=tags/v2.8.0-rc3" >> "${GITHUB_ENV}"; + echo "AGDA_COMMIT=tags/v2.8.0" >> "${GITHUB_ENV}"; echo "AGDA_HTML_DIR=html/master" >> "${GITHUB_ENV}" fi @@ -148,7 +149,7 @@ jobs: # By default github actions do not pull the repo - name: Checkout stdlib - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Test stdlib run: |