Skip to content

Commit e416842

Browse files
committed
Auto merge of #18328 - Veykril:veykril/push-zrzmmyqzqwyr, r=
fix: Fix CI running analysis-stats incorrectly against the standard libraries Fixes #18326
2 parents 8dd53a3 + 705f9ef commit e416842

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

.github/workflows/ci.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ jobs:
104104
if: matrix.os == 'ubuntu-latest'
105105
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats .
106106

107-
- name: Run analysis-stats on rust std library
107+
- name: Run analysis-stats on the rust standard libraries
108108
if: matrix.os == 'ubuntu-latest'
109109
env:
110-
RUSTC_BOOTSTRAP: 1
111-
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps $(rustc --print sysroot)/lib/rustlib/src/rust/library/std
110+
RUSTC_BOOTSTRAP: 1
111+
run: target/${{ matrix.target }}/debug/rust-analyzer analysis-stats --with-deps --no-sysroot $(rustc --print sysroot)/lib/rustlib/src/rust/library/
112112

113113
- name: clippy
114114
if: matrix.os == 'windows-latest'

crates/project-model/src/tests.rs

-2
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,6 @@ fn rust_project_is_proc_macro_has_proc_macro_dep() {
222222
}
223223

224224
#[test]
225-
// FIXME Remove the ignore
226-
#[ignore = "requires nightly until the sysroot ships a cargo workspace for library on stable"]
227225
fn smoke_test_real_sysroot_cargo() {
228226
let file_map = &mut FxHashMap::<AbsPathBuf, FileId>::default();
229227
let meta: Metadata = get_test_json_file("hello-world-metadata.json");

0 commit comments

Comments
 (0)