Skip to content

Commit b0cf5ee

Browse files
authored
Merge branch 'master' into gen-blanket-trait-impl
2 parents 14f3de3 + b5b10fb commit b0cf5ee

File tree

220 files changed

+6245
-2761
lines changed

Some content is hidden

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

220 files changed

+6245
-2761
lines changed

.github/workflows/ci.yaml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
CC: deny_c
8585

8686
strategy:
87+
fail-fast: false
8788
matrix:
8889
os: [ubuntu-latest, windows-latest, macos-latest]
8990

@@ -103,7 +104,7 @@ jobs:
103104
rustup toolchain install nightly --profile minimal --component rustfmt
104105
# https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/rust.json
105106
- name: Install Rust Problem Matcher
106-
if: matrix.os == 'ubuntu-latest'
107+
if: matrix.os == 'macos-latest'
107108
run: echo "::add-matcher::.github/rust.json"
108109

109110
# - name: Cache Dependencies
@@ -120,23 +121,9 @@ jobs:
120121
if: matrix.os == 'ubuntu-latest'
121122
run: cargo codegen --check
122123

123-
- name: Compile tests
124-
run: cargo test --no-run
125-
126124
- name: Run tests
127125
run: cargo nextest run --no-fail-fast --hide-progress-bar --status-level fail
128126

129-
- name: Cancel parallel jobs
130-
if: failure()
131-
run: |
132-
# https://docs.github.com/en/rest/actions/workflow-runs?apiVersion=2022-11-28#cancel-a-workflow-run
133-
curl -L \
134-
-X POST \
135-
-H "Accept: application/vnd.github.v3+json" \
136-
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
137-
-H "X-GitHub-Api-Version: 2022-11-28" \
138-
https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/cancel
139-
140127
- name: Run Clippy
141128
if: matrix.os == 'macos-latest'
142129
run: cargo clippy --all-targets -- -D clippy::disallowed_macros -D clippy::dbg_macro -D clippy::todo -D clippy::print_stdout -D clippy::print_stderr
@@ -337,3 +324,21 @@ jobs:
337324
jq -C <<< '${{ toJson(needs) }}'
338325
# Check if all jobs that we depend on (in the needs array) were successful (or have been skipped).
339326
jq --exit-status 'all(.result == "success" or .result == "skipped")' <<< '${{ toJson(needs) }}'
327+
328+
cancel-if-matrix-failed:
329+
needs: rust
330+
if: ${{ always() }}
331+
runs-on: ubuntu-latest
332+
steps:
333+
- name: Cancel parallel jobs
334+
run: |
335+
if jq --exit-status 'all(.result == "success" or .result == "skipped")' <<< '${{ toJson(needs) }}'; then
336+
exit 0
337+
fi
338+
# https://docs.github.com/en/rest/actions/workflow-runs?apiVersion=2022-11-28#cancel-a-workflow-run
339+
curl -L \
340+
-X POST \
341+
-H "Accept: application/vnd.github.v3+json" \
342+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
343+
-H "X-GitHub-Api-Version: 2022-11-28" \
344+
https://api.github.com/repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/cancel

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ jobs:
134134

135135
- name: Run analysis-stats on rust-analyzer
136136
if: matrix.target == 'x86_64-unknown-linux-gnu'
137-
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats .
137+
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats . -q
138138

139139
- name: Run analysis-stats on rust std library
140140
if: matrix.target == 'x86_64-unknown-linux-gnu'
141141
env:
142142
RUSTC_BOOTSTRAP: 1
143-
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
143+
run: target/${{ matrix.target }}/release/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std -q
144144

145145
- name: Upload artifacts
146146
uses: actions/upload-artifact@v4

.github/workflows/rustc-pull.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: rustc-pull
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
# Run at 04:00 UTC every Monday and Thursday
7+
- cron: '0 4 * * 1,4'
8+
9+
jobs:
10+
pull:
11+
if: github.repository == 'rust-lang/rust-analyzer'
12+
uses: rust-lang/josh-sync/.github/workflows/rustc-pull.yml@main
13+
with:
14+
zulip-stream-id: 185405
15+
zulip-bot-email: "rust-analyzer-ci-bot@rust-lang.zulipchat.com"
16+
pr-base-branch: master
17+
branch-name: rustc-pull
18+
secrets:
19+
zulip-api-token: ${{ secrets.ZULIP_API_TOKEN }}
20+
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)