Auto merge of rust-lang#117985 - lnicola:sync-from-ra, r=lnicola

Subtree update of `rust-analyzer` r? `@ghost` Out of band, but required for rust-lang#117981.
rust-lang-ci · Nov 16, 2023 · 2c962ec · 2c962ec
2 parents a577704 + 949870c
commit 2c962ec
Show file tree

Hide file tree

Showing 131 changed files with 2,212 additions and 970 deletions.
diff --git a/src/tools/rust-analyzer/.github/workflows/release.yaml b/src/tools/rust-analyzer/.github/workflows/release.yaml
@@ -30,7 +30,6 @@ jobs:
             code-target: win32-x64
           - os: windows-latest
             target: i686-pc-windows-msvc
-            code-target: win32-ia32
           - os: windows-latest
             target: aarch64-pc-windows-msvc
             code-target: win32-arm64
@@ -102,12 +101,12 @@ jobs:
         working-directory: editors/code
 
       - name: Package Extension (release)
-        if: github.ref == 'refs/heads/release'
+        if: github.ref == 'refs/heads/release' && matrix.code-target
         run: npx vsce package -o "../../dist/rust-analyzer-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
         working-directory: editors/code
 
       - name: Package Extension (nightly)
-        if: github.ref != 'refs/heads/release'
+        if: github.ref != 'refs/heads/release' && matrix.code-target
         run: npx vsce package -o "../../dist/rust-analyzer-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
         working-directory: editors/code