[ git ] Merge remote-tracking branch 'origin/dev'

Author: banacorn

.github/workflows/test.yaml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-latest, macos-13]
+        os: [windows-latest, ubuntu-latest, macos-latest, macos-15-intel]
         agda: ['Agda-2.8.0', 'Agda-2.7.0.1', 'Agda-2.6.4.3']
       fail-fast: false
     steps:
@@ -40,6 +40,8 @@ jobs:
         # Determine artifact naming based on branch/tag
         if [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
           PREFIX="als-dev"
+        elif [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+          PREFIX="als-${{ github.ref_name }}"
         else
           PREFIX="als"
         fi
@@ -50,7 +52,7 @@ jobs:
         if [[ ${{ matrix.os }} == "macos-latest" ]]; then
           ARTEFACT="$PREFIX-${{ matrix.agda }}-macos-arm64"
         fi
-        if [[ ${{ matrix.os }} == "macos-13" ]]; then
+        if [[ ${{ matrix.os }} == "macos-15-intel" ]]; then
           ARTEFACT="$PREFIX-${{ matrix.agda }}-macos-x64"
         fi
         if [[ ${{ matrix.os }} == "windows-latest" ]]; then
@@ -315,7 +317,8 @@ jobs:
     - name: 🧪 Run tests
       run: stack test $STACK_YAML_ARG
 
-    - name: 📤 Upload build artifact
+    - name: 📤 Upload native artifact
+      if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/ci'
       uses: actions/upload-artifact@v4
       with:
         name: ${{ env.ARTEFACT }}
@@ -324,8 +327,15 @@ jobs:
 
   build-wasm:
     name: Build WASM
-    if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/ci'
+    if: startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/ci'
     runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        agda:
+        - { name: '2.8.0', label: 'Agda-2.8.0', flag: '2-8-0', commit: 'e2f8c69414fa115328280ecc4de1d2b7a23be7fa' }
+        - { name: '2.7.0.1', label: 'Agda-2.7.0.1', flag: '2-7-0', commit: '702c924fdab93aa8992adca84e72a91c490f7b1b' }
+        - { name: '2.6.4.3', label: 'Agda-2.6.4.3', flag: '2-6-4', commit: '8f35851954c39dc3849095bfd018bed9bd1b32ad' }
+      fail-fast: false
 
     env:
       GHC_WASM_META_FLAVOUR: '9.10'
@@ -338,7 +348,16 @@ jobs:
         submodules: true
 
     - name: Compute cache key
-      run: echo "CI_CACHE_KEY=${{ runner.os }}-${{ runner.arch }}-${{ env.GHC_WASM_META_COMMIT_HASH }}-flavor-${{ env.GHC_WASM_META_FLAVOUR }}" >> "$GITHUB_ENV"
+      run: |
+        echo "CI_CACHE_KEY=${{ runner.os }}-${{ runner.arch }}-${{ env.GHC_WASM_META_COMMIT_HASH }}-flavor-${{ env.GHC_WASM_META_FLAVOUR }}-${{ matrix.agda.name }}" >> "$GITHUB_ENV"
+        if [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
+          PREFIX="als-dev"
+        elif [[ "${{ github.ref }}" == refs/tags/v* ]]; then
+          PREFIX="als-${{ github.ref_name }}"
+        else
+          PREFIX="als"
+        fi
+        echo "WASM_ASSET_BASENAME=${PREFIX}-${{ matrix.agda.label }}-wasm" >> "$GITHUB_ENV"
 
     - name: Try to restore cached .ghc-wasm
       id: ghc-wasm-cache-restore
@@ -360,15 +379,6 @@ jobs:
         restore-keys: |
           native-cabal-${{ runner.os }}-${{ runner.arch }}-
 
-    - name: Try to restore cached dist-newstyle
-      id: dist-newstyle-cache-restore
-      uses: actions/cache/restore@v4
-      with:
-        path: als/dist-newstyle
-        key: dist-newstyle-${{ env.CI_CACHE_KEY }}
-        restore-keys: |
-          dist-newstyle-${{ runner.os }}-${{ runner.arch }}-
-
     - name: Clone and setup ghc-wasm-meta
       id: ghc-wasm-setup
       if: steps.ghc-wasm-cache-restore.outputs.cache-matched-key == ''
@@ -397,11 +407,28 @@ jobs:
         echo ">>> Install alex and happy"
         ~/.ghc-wasm/cabal/bin/cabal install alex-3.5.0.0 happy-1.20.1.1
 
+    - name: Checkout Agda submodule at v${{ matrix.agda.name }}
+      run: |
+        cd als/wasm-submodules/agda
+        git fetch --depth 1 origin "${{ matrix.agda.commit }}"
+        git checkout FETCH_HEAD
+        echo "AGDA_WASM_COMMIT=$(git rev-parse HEAD)" >> "$GITHUB_ENV"
+
+    - name: Restore dist-newstyle cache for resolved Agda revision
+      id: dist-newstyle-cache-restore-resolved
+      uses: actions/cache/restore@v4
+      with:
+        path: als/dist-newstyle
+        key: dist-newstyle-${{ env.CI_CACHE_KEY }}-agda-${{ env.AGDA_WASM_COMMIT }}-${{ hashFiles('als/cabal.project.wasm32', 'als/agda-language-server.cabal', 'als/package.yaml') }}
+        restore-keys: |
+          dist-newstyle-${{ env.CI_CACHE_KEY }}-agda-${{ env.AGDA_WASM_COMMIT }}-
+          dist-newstyle-${{ runner.os }}-${{ runner.arch }}-
+
     - name: Cabal configure
       working-directory: './als'
       run: |
         mv cabal.project.wasm32 cabal.project
-        wasm32-wasi-cabal configure --flag=Agda-2-8-0
+        wasm32-wasi-cabal configure --flag=Agda-${{ matrix.agda.flag }}
 
     - name: Build Agda as dependency
       id: build-dep-agda
@@ -413,7 +440,7 @@ jobs:
       if: steps.build-dep-agda.outcome == 'success'
       with:
         path: als/dist-newstyle
-        key: dist-newstyle-${{ env.CI_CACHE_KEY }}
+        key: dist-newstyle-${{ env.CI_CACHE_KEY }}-agda-${{ env.AGDA_WASM_COMMIT }}-${{ hashFiles('als/cabal.project.wasm32', 'als/agda-language-server.cabal', 'als/package.yaml') }}
 
     - name: Build dependencies other than Agda
       working-directory: './als'
@@ -431,9 +458,8 @@ jobs:
         mkdir ~/out
         wasm32-wasi-cabal build
         WASM_BINARY_PATH=$(wasm32-wasi-cabal list-bin als)
-        WASM_BINARY_NAME=$(basename "$WASM_BINARY_PATH")
-        cp "$WASM_BINARY_PATH" ~/out
-        echo "WASM_BINARY_NAME=$WASM_BINARY_NAME" >> $GITHUB_ENV
+        cp "$WASM_BINARY_PATH" ~/out/${WASM_ASSET_BASENAME}.wasm
+        echo "WASM_BINARY_NAME=${WASM_ASSET_BASENAME}.wasm" >> $GITHUB_ENV
 
     - name: Clean up native/wasm cabal logs
       run: rm -rf ~/.cache/cabal/logs ~/.ghc-wasm/.cabal/logs
@@ -457,7 +483,7 @@ jobs:
     - name: 📤 Upload WASM artifact
       uses: actions/upload-artifact@v4
       with:
-        name: als-dev-wasm
+        name: ${{ env.WASM_ASSET_BASENAME }}
         path: ~/out/${{ env.WASM_BINARY_NAME }}
         retention-days: 1
 
@@ -520,7 +546,12 @@ jobs:
           if [ -f "${artifact_name}/${artifact_name}.zip" ]; then
             gh release upload ${{ github.ref_name }} "${artifact_name}/${artifact_name}.zip" --clobber --repo ${{ github.repository }}
           else
-            echo "Warning: No .zip file found in ${artifact_name}"
+            artifact_file=$(find "${artifact_name}" -maxdepth 1 -type f | head -1)
+            if [ -n "$artifact_file" ]; then
+              gh release upload ${{ github.ref_name }} "$artifact_file" --clobber --repo ${{ github.repository }}
+            else
+              echo "Warning: No uploadable file found in ${artifact_name}"
+            fi
           fi
         done
 
@@ -541,21 +572,17 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         cd artifacts
-        # Upload only Agda-2.8.0 artifacts and WASM
-        for dir in *Agda-2.8.0* als-dev-wasm; do
-          if [ -d "$dir" ]; then
-            artifact_name="$dir"
-            echo "Uploading ${artifact_name}..."
-            if [ -f "${artifact_name}/${artifact_name}.zip" ]; then
-              gh release upload dev "${artifact_name}/${artifact_name}.zip" --clobber --repo ${{ github.repository }}
-            elif [ "$artifact_name" = "als-dev-wasm" ]; then
-              # Find the WASM binary (filename may vary)
-              wasm_file=$(find "${artifact_name}" -type f -name "als*" | head -1)
-              if [ -n "$wasm_file" ]; then
-                gh release upload dev "$wasm_file" --clobber --repo ${{ github.repository }}
-              else
-                echo "Warning: WASM binary not found in ${artifact_name}"
-              fi
+        for dir in */; do
+          artifact_name="${dir%/}"
+          echo "Uploading ${artifact_name}..."
+          if [ -f "${artifact_name}/${artifact_name}.zip" ]; then
+            gh release upload dev "${artifact_name}/${artifact_name}.zip" --clobber --repo ${{ github.repository }}
+          else
+            artifact_file=$(find "${artifact_name}" -maxdepth 1 -type f | head -1)
+            if [ -n "$artifact_file" ]; then
+              gh release upload dev "$artifact_file" --clobber --repo ${{ github.repository }}
+            else
+              echo "Warning: No uploadable file found in ${artifact_name}"
             fi
           fi
-        done
+        done

agda-language-server.cabal

@@ -160,8 +160,7 @@ executable als
   if arch(wasm32)
     build-depends:
         unix >=2.8.0.0 && <2.9
-    ghc-options: -with-rtsopts=-V1
-  else
+  if !arch(wasm32)
     ghc-options: -threaded -with-rtsopts=-N
 
 test-suite als-test
@@ -242,6 +241,5 @@ test-suite als-test
   if arch(wasm32)
     build-depends:
         unix >=2.8.0.0 && <2.9
-    ghc-options: -with-rtsopts=-V1
-  else
+  if !arch(wasm32)
     ghc-options: -threaded -with-rtsopts=-N

cabal.project.wasm32

@@ -1,3 +1,9 @@
+index-state: 2026-02-16T23:59:59Z
+
+constraints:
+  lsp == 2.7.0.1,
+  lsp-types == 2.3.0.1
+
 packages:
   .
   wasm-submodules/agda