Merge remote-tracking branch 'agda-original/master' into release-2.6.…

…3-sexp

.envrc

@@ -0,0 +1,6 @@
+# Auto-load a development environment from flake.nix
+# when entering the root of the repository
+
+# This only affects users of the `direnv` tool
+
+use flake

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,7 +11,7 @@ assignees: ''
 
 Please make sure it is actually a problem with Agda or its documentation. For user questions, the [mailing list](https://lists.chalmers.se/mailman/listinfo/agda) or the [chat](https://agda.zulipchat.com) are better fora.
 
-Please take some time to search through the exising issues whether the problem has already been reported.  If it is already an open issue, you might confine yourself with just adding your problem instance as a comment there.
+Please take some time to search through the existing issues whether the problem has already been reported.  If it is already an open issue, you might confine yourself with just adding your problem instance as a comment there.
 
 For opening a new issue, please make sure you can check the following boxes:
 
@@ -23,3 +23,5 @@ For opening a new issue, please make sure you can check the following boxes:
 * [ ] I have supplied all information so the bug can be easily reproduced (in particular, the reproducer is a complete Agda file).
 
 Note: The best reproducers are those only using the `Agda.Builtin` and `Agda.Primitive` modules shipped with Agda.
+
+Once you have ticked the boxes, you can delete this text (no need to include the checklist in the issue report).

.github/workflows/README.md

@@ -9,8 +9,8 @@ Do not edit the YAML files here directly!
 - Tested with
   ```bash
   $ yaml2json --version
-  yaml2json version 0.11.8.0 https://github.com/snoyberg/yaml/
+  yaml2json version 0.11.11.2 https://github.com/snoyberg/yaml/
 
   $ json2yaml --version
-  json2yaml version 0.11.8.0 https://github.com/snoyberg/yaml/
+  json2yaml version 0.11.11.2 https://github.com/snoyberg/yaml/
   ```

.github/workflows/cabal-test.yml → .github/workflows/cabal-install.yml

@@ -15,85 +15,75 @@ jobs:
       && !contains(github.event.head_commit.message, '[ci skip]')
       && !contains(github.event.head_commit.message, '[github skip]')
       && !contains(github.event.head_commit.message, '[skip github]')
-    runs-on: Ubuntu-latest
+    runs-on: ubuntu-latest
     steps:
-    - uses: styfle/cancel-workflow-action@0.11.0
+    - uses: styfle/cancel-workflow-action@0.12.1
       with:
         access_token: ${{ github.token }}
-  cabal:
+  cabal-install:
+    env:
+      FLAGS: -O0 -f enable-cluster-counting
     needs: auto-cancel
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
-    - id: setup-haskell
-      uses: haskell/actions/setup@v2
-      with:
-        cabal-version: ${{ matrix.cabal-ver }}
-        ghc-version: ${{ matrix.ghc-ver }}
+    - uses: actions/checkout@v4
+    - name: Set up cabal
+      run: |
+        mkdir -p ~/.cabal
+        cabal update
     - name: Environment settings based on the Haskell setup
       run: |
-        export GHC_VER=$(ghc --numeric-version)
-        export CABAL_VER=$(cabal --numeric-version)
+        GHC_VER=$(ghc --numeric-version)
+        CABAL_VER=$(cabal --numeric-version)
         echo "GHC_VER   = ${GHC_VER}"
         echo "CABAL_VER = ${CABAL_VER}"
         echo "GHC_VER=${GHC_VER}"       >> ${GITHUB_ENV}
         echo "CABAL_VER=${CABAL_VER}"   >> ${GITHUB_ENV}
     - name: Configure the build plan
       run: |
-        cabal update
-        cabal configure -O1 --enable-tests
-    - id: cache
-      name: Cache dependencies
-      uses: actions/cache@v3
+        cabal configure ${FLAGS}
+        cabal build --dry-run
+    - env:
+        key: cabal-install.yml-${{ runner.os }}-ghc-${{ env.GHC_VER }}-cabal-${{ env.CABAL_VER
+          }}
+      id: cache
+      name: Restore cached dependencies
+      uses: actions/cache/restore@v4
       with:
-        key: ${{ runner.os }}-cabal-test-${{ env.GHC_VER }}-${{ env.CABAL_VER }}-${{
-          hashFiles('**/plan.json') }}
-        path: |
-          ${{ steps.setup-haskell.outputs.cabal-store }}
-    - if: ${{ !steps.cache.outputs.cache-hit }}
+        key: ${{ env.key }}-${{ hashFiles('**/plan.json') }}
+        path: ~/.cabal/store
+        restore-keys: ${{ env.key }}-
+    - if: ${{ steps.cache.outputs.cache-hit != 'true' }}
       name: Install dependencies
       run: |
-        cabal build --only-dependencies --enable-tests
+        cabal build --only-dependencies
     - name: Install Agda
       run: |
-        mkdir -p ${HOME}/bin
-        cabal install --installdir=${HOME}/bin
-    - name: Build and test Agda
-      run: |
-        export PATH=${HOME}/bin:${PATH}
-        cabal test
-    strategy:
-      fail-fast: false
-      matrix:
-        cabal-ver:
-        - '3.8'
-        ghc-ver:
-        - '9.4'
-        os:
-        - ubuntu-22.04
-        - macos-12
-    timeout-minutes: 150
-name: cabal-test
+        cabal install ${FLAGS}
+    - if: ${{ always() && (steps.cache.outputs.cache-hit != 'true') }}
+      name: Save cache
+      uses: actions/cache/save@v4
+      with:
+        key: ${{ steps.cache.outputs.cache-primary-key }}
+        path: ~/.cabal/store
+    timeout-minutes: 60
+name: Install (v2-cabal)
 'on':
   pull_request:
     paths:
-    - .github/workflows/cabal-test.yml
+    - .github/workflows/cabal-install.yml
     - Agda.cabal
     - Setup.hs
     - src/full/**
     - src/main/**
-    - test/**.hs
   push:
     branches:
     - master
     - ci-*
     - release*
     paths:
-    - .github/workflows/cabal-test.yml
+    - .github/workflows/cabal-install.yml
     - Agda.cabal
     - Setup.hs
     - src/full/**
     - src/main/**
-    - test/**.hs

.github/workflows/cabal.yml

@@ -17,99 +17,127 @@ jobs:
       && !contains(github.event.head_commit.message, '[skip github]')
     runs-on: Ubuntu-latest
     steps:
-    - uses: styfle/cancel-workflow-action@0.11.0
+    - uses: styfle/cancel-workflow-action@0.12.1
       with:
         access_token: ${{ github.token }}
   cabal:
     env:
-      FLAGS: -f enable-cluster-counting
+      CABAL_VER: ${{ matrix.cabal-ver || '3.10' }}
+      FLAGS: ${{ matrix.cabal-flags || '--enable-tests -f enable-cluster-counting'
+        }}
+      GHC_VER: ${{ matrix.ghc-ver || '9.8.2' }}
+    name: Cabal ${{ matrix.description }}, ${{ matrix.ghc-ver }}
     needs: auto-cancel
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: recursive
+    - uses: actions/checkout@v4
+    - if: ${{ runner.os == 'Linux' }}
+      name: Switch off XDG directories for cabal (Linux)
+      run: |
+        mkdir -p ~/.cabal
     - id: setup-haskell
-      uses: haskell/actions/setup@v2
+      uses: haskell-actions/setup@v2
       with:
-        cabal-version: ${{ matrix.cabal-ver }}
-        ghc-version: ${{ matrix.ghc-ver }}
+        cabal-update: true
+        cabal-version: ${{ env.CABAL-VER }}
+        ghc-version: ${{ env.GHC_VER }}
     - name: Environment settings based on the Haskell setup
       run: |
-        export GHC_VER=$(ghc --numeric-version)
-        export CABAL_VER=$(cabal --numeric-version)
+        GHC_VER=$(ghc --numeric-version)
+        CABAL_VER=$(cabal --numeric-version)
         echo "GHC_VER   = ${GHC_VER}"
         echo "CABAL_VER = ${CABAL_VER}"
-        echo "GHC_VER=${GHC_VER}"       >> ${GITHUB_ENV}
-        echo "CABAL_VER=${CABAL_VER}"   >> ${GITHUB_ENV}
-    - if: ${{ runner.os == 'Windows' }}
-      name: Setup MSYS path (Windows)
-      run: |
-        echo "C:\msys64\mingw64\bin;C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-      shell: pwsh
+        echo "GHC_VER=${GHC_VER}"       >> "${GITHUB_ENV}"
+        echo "CABAL_VER=${CABAL_VER}"   >> "${GITHUB_ENV}"
     - if: ${{ runner.os == 'Windows' }}
       name: Install the ICU library (Windows)
       run: |
-        pacman --noconfirm -Sy msys2-keyring mingw-w64-x86_64-pkg-config mingw-w64-x86_64-icu
+        $env:PATH = "C:\msys64\usr\bin;$env:PATH"
+        pacman --noconfirm -S msys2-keyring mingw-w64-x86_64-pkgconf mingw-w64-x86_64-icu
+        echo "C:\msys64\mingw64\bin" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+      shell: pwsh
     - if: ${{ runner.os == 'macOS' }}
       name: Set up pkg-config for the ICU library (macOS)
       run: |
-        export PKG_CONFIG_PATH=$(brew --prefix)/opt/icu4c/lib/pkgconfig
-        echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}" >> ${GITHUB_ENV}
-        # print some information to debug pkg-config
-        echo "$ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}"
-        echo "$ ls -l ${PKG_CONFIG_PATH}"
-        ls -l ${PKG_CONFIG_PATH}
-        echo "$ pkg-config --modversion icu-i18n"
-        pkg-config --modversion icu-i18n
+        PKG_CONFIG_PATH=$(brew --prefix)/opt/icu4c/lib/pkgconfig
+        echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}" >> "${GITHUB_ENV}"
+        # # print some information to debug pkg-config
+        # echo "$ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}"
+        # echo "$ ls -l ${PKG_CONFIG_PATH}"
+        # ls -l "${PKG_CONFIG_PATH}"
+        # export PKG_CONFIG_PATH
+        # echo "$ pkg-config --modversion icu-i18n"
+        # pkg-config --modversion icu-i18n
+    - name: Determine the ICU version
+      run: |
+        ICU_VER=$(pkg-config --modversion icu-i18n)
+        echo "ICU_VER=${ICU_VER}"
+        echo "ICU_VER=${ICU_VER}" >> "${GITHUB_ENV}"
     - name: Configure the build plan
       run: |
-        cabal update
-        cabal configure ${FLAGS} -O0 ${{ matrix.cabal-flags }}
+        cabal configure -O0 ${FLAGS}
+        cabal build --dry-run
     - id: cache
-      name: Cache dependencies
-      uses: actions/cache@v3
+      name: Restore cache from approximate key
+      uses: actions/cache@v4
       with:
-        key: ${{ runner.os }}-cabal-01-${{ env.GHC_VER }}-${{ env.CABAL_VER }}-${{
-          hashFiles('**/plan.json') }}
+        key: cabal.yml-${{ runner.os }}-ghc-${{ env.GHC_VER }}-cabal-${{ env.CABAL_VER
+          }}-${{ hashFiles('**/plan.json') }}
         path: |
           ${{ steps.setup-haskell.outputs.cabal-store }}
-    - if: ${{ !steps.cache.outputs.cache-hit }}
+        restore-keys: cabal.yml-${{ runner.os }}-ghc-${{ env.GHC_VER }}-cabal-${{
+          env.CABAL_VER }}-
+    - if: ${{ steps.cache.outputs.cache-hit != 'true' }}
       name: Install dependencies
       run: |
         cabal build --only-dependencies
     - name: Build Agda
       run: |
         cabal build
-    - name: Build Agda without enable-cluster-counting
+    - if: ${{ matrix.doctest }}
+      name: Run doctest
       run: |
-        cabal configure -O0
-        cabal build
+        make doc-test
     strategy:
       fail-fast: false
       matrix:
+        cabal-flags:
+        - --enable-tests -f enable-cluster-counting
         cabal-ver:
-        - '3.8'
+        - '3.10'
+        description:
+        - Linux
+        doctest:
+        - false
         ghc-ver:
-        - 9.4.4
-        - 9.2.5
+        - 9.8.2
+        - 9.6.4
+        - 9.4.8
+        - 9.2.8
         - 9.0.2
         - 8.10.7
         - 8.8.4
         - 8.6.5
-        - 8.4.4
-        - 8.2.2
-        - 8.0.2
         include:
-        - cabal-flags: -c 'mtl >= 2.3.1'
-          cabal-ver: '3.8'
-          ghc-ver: 9.4.4
+        - cabal-flags: --disable-tests
+          description: Linux doctest
+          doctest: true
+          ghc-ver: 9.8.2
+          os: ubuntu-22.04
+        - cabal-flags: --enable-tests -f debug
+          description: Linux debug
+          ghc-ver: 9.8.2
+          os: ubuntu-22.04
+        - cabal-flags: --enable-tests -f enable-cluster-counting -f debug -f debug-serialisation
+            -f debug-parsing -c containers>=0.7 --allow-newer=containers
+          description: Linux containers 0.7
+          ghc-ver: 9.8.2
           os: ubuntu-22.04
-        - cabal-ver: '3.8'
-          ghc-ver: 9.4.4
+        - description: macOS
+          ghc-ver: 9.8.2
           os: macos-12
-        - cabal-ver: '3.8'
-          ghc-ver: 9.4.4
+        - description: Windows
+          ghc-ver: 9.8.2
           os: windows-2022
         os:
         - ubuntu-22.04