Skip to content

Commit 949870c

Browse files
committed
Merge commit '141fc695dca1df7cfc3c9803972ec19bb178dcbc' into sync-from-ra
2 parents 0ea7ddc + 141fc69 commit 949870c

File tree

131 files changed

+2212
-970
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+2212
-970
lines changed

src/tools/rust-analyzer/.github/workflows/release.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ jobs:
3030
code-target: win32-x64
3131
- os: windows-latest
3232
target: i686-pc-windows-msvc
33-
code-target: win32-ia32
3433
- os: windows-latest
3534
target: aarch64-pc-windows-msvc
3635
code-target: win32-arm64
@@ -102,12 +101,12 @@ jobs:
102101
working-directory: editors/code
103102

104103
- name: Package Extension (release)
105-
if: github.ref == 'refs/heads/release'
104+
if: github.ref == 'refs/heads/release' && matrix.code-target
106105
run: npx vsce package -o "../../dist/rust-analyzer-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }}
107106
working-directory: editors/code
108107

109108
- name: Package Extension (nightly)
110-
if: github.ref != 'refs/heads/release'
109+
if: github.ref != 'refs/heads/release' && matrix.code-target
111110
run: npx vsce package -o "../../dist/rust-analyzer-${{ matrix.code-target }}.vsix" --target ${{ matrix.code-target }} --pre-release
112111
working-directory: editors/code
113112

0 commit comments

Comments
 (0)