Skip to content

Commit b7e03a6

Browse files
authoredFeb 5, 2024
Unrolled build for rust-lang#120636
Rollup merge of rust-lang#120636 - lnicola:sync-from-ra, r=lnicola Subtree update of `rust-analyzer` r? ghost
2 parents 0984bec + 98ad126 commit b7e03a6

File tree

197 files changed

+3103
-2004
lines changed

Some content is hidden

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

197 files changed

+3103
-2004
lines changed
 

‎src/tools/rust-analyzer/.github/workflows/ci.yaml

+21-3
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
- name: Switch to stable toolchain
9191
run: |
9292
rustup update --no-self-update stable
93-
rustup component add --toolchain stable rust-src
93+
rustup component add --toolchain stable rust-src clippy
9494
rustup default stable
9595
9696
- name: Run analysis-stats on rust-analyzer
@@ -103,6 +103,10 @@ jobs:
103103
RUSTC_BOOTSTRAP: 1
104104
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
105105

106+
- name: clippy
107+
if: matrix.os == 'ubuntu-latest'
108+
run: cargo clippy --all-targets
109+
106110
# Weird targets to catch non-portable code
107111
rust-cross:
108112
if: github.repository == 'rust-lang/rust-analyzer'
@@ -203,11 +207,25 @@ jobs:
203207
working-directory: ./editors/code
204208
if: needs.changes.outputs.typescript == 'true'
205209

210+
typo-check:
211+
name: Typo Check
212+
runs-on: ubuntu-latest
213+
timeout-minutes: 10
214+
env:
215+
FORCE_COLOR: 1
216+
TYPOS_VERSION: v1.18.0
217+
steps:
218+
- name: download typos
219+
run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
220+
221+
- name: check for typos
222+
run: typos
223+
206224
end-success:
207225
name: bors build finished
208226
if: github.event.pusher.name == 'bors' && success()
209227
runs-on: ubuntu-latest
210-
needs: [rust, rust-cross, typescript]
228+
needs: [rust, rust-cross, typescript, typo-check]
211229
steps:
212230
- name: Mark the job as successful
213231
run: exit 0
@@ -216,7 +234,7 @@ jobs:
216234
name: bors build finished
217235
if: github.event.pusher.name == 'bors' && !success()
218236
runs-on: ubuntu-latest
219-
needs: [rust, rust-cross, typescript]
237+
needs: [rust, rust-cross, typescript, typo-check]
220238
steps:
221239
- name: Mark the job as a failure
222240
run: exit 1

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ jobs:
4343
- os: ubuntu-20.04
4444
target: arm-unknown-linux-gnueabihf
4545
code-target: linux-armhf
46-
- os: macos-11
46+
- os: macos-12
4747
target: x86_64-apple-darwin
4848
code-target: darwin-x64
49-
- os: macos-11
49+
- os: macos-12
5050
target: aarch64-apple-darwin
5151
code-target: darwin-arm64
5252

0 commit comments

Comments
 (0)