Skip to content

Commit

Permalink
Auto merge of rust-lang#117985 - lnicola:sync-from-ra, r=lnicola
Browse files Browse the repository at this point in the history
Subtree update of `rust-analyzer`

r? `@ghost`

Out of band, but required for rust-lang#117981.
  • Loading branch information
bors committed Nov 16, 2023
2 parents a577704 + 949870c commit 2c962ec
Show file tree
Hide file tree
Showing 131 changed files with 2,212 additions and 970 deletions.
5 changes: 2 additions & 3 deletions src/tools/rust-analyzer/.github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
Loading

0 comments on commit 2c962ec

Please sign in to comment.