Skip to content

Commit 42d602b

Browse files
committed
Remove std_detect from stdarch's CI
1 parent 38130d7 commit 42d602b

File tree

5 files changed

+1
-70
lines changed

5 files changed

+1
-70
lines changed

library/stdarch/.github/workflows/main.yml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -255,22 +255,11 @@ jobs:
255255
env:
256256
TARGET: ${{ matrix.target.tuple }}
257257

258-
build-std-detect:
259-
needs: [style]
260-
name: Build std_detect
261-
runs-on: ubuntu-latest
262-
steps:
263-
- uses: actions/checkout@v4
264-
- name: Install Rust
265-
run: rustup update nightly && rustup default nightly
266-
- run: ./ci/build-std-detect.sh
267-
268258
conclusion:
269259
needs:
270260
- docs
271261
- verify
272262
- test
273-
- build-std-detect
274263
runs-on: ubuntu-latest
275264
# We need to ensure this job does *not* get skipped if its dependencies fail,
276265
# because a skipped job is considered a success by GitHub. So we have to

library/stdarch/ci/build-std-detect.sh

Lines changed: 0 additions & 46 deletions
This file was deleted.

library/stdarch/ci/dox.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@ dox() {
1616
cargo clean --target "${1}"
1717

1818
cargo build --verbose --target "${1}" --manifest-path crates/core_arch/Cargo.toml
19-
cargo build --verbose --target "${1}" --manifest-path crates/std_detect/Cargo.toml
20-
2119
cargo doc --verbose --target "${1}" --manifest-path crates/core_arch/Cargo.toml
22-
cargo doc --verbose --target "${1}" --manifest-path crates/std_detect/Cargo.toml
2320
}
2421

2522
if [ -z "$1" ]; then

library/stdarch/ci/run-docker.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ run() {
3737
--env NORUN \
3838
--env RUSTFLAGS \
3939
--env CARGO_UNSTABLE_BUILD_STD \
40-
--env RUST_STD_DETECT_UNSTABLE \
4140
--volume "${HOME}/.cargo":/cargo \
4241
--volume "$(rustc --print sysroot)":/rust:ro \
4342
--volume "$(pwd)":/checkout:ro \

library/stdarch/ci/run.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,12 @@ cargo_test() {
7878
}
7979

8080
CORE_ARCH="--manifest-path=crates/core_arch/Cargo.toml"
81-
STD_DETECT="--manifest-path=crates/std_detect/Cargo.toml"
8281
STDARCH_EXAMPLES="--manifest-path=examples/Cargo.toml"
8382
INTRINSIC_TEST="--manifest-path=crates/intrinsic-test/Cargo.toml"
8483

8584
cargo_test "${CORE_ARCH} ${PROFILE}"
8685

8786
if [ "$NOSTD" != "1" ]; then
88-
cargo_test "${STD_DETECT} ${PROFILE}"
89-
90-
cargo_test "${STD_DETECT} --no-default-features"
91-
cargo_test "${STD_DETECT} --no-default-features --features=std_detect_file_io"
92-
cargo_test "${STD_DETECT} --no-default-features --features=std_detect_dlsym_getauxval"
93-
cargo_test "${STD_DETECT} --no-default-features --features=std_detect_dlsym_getauxval,std_detect_file_io"
94-
9587
cargo_test "${STDARCH_EXAMPLES} ${PROFILE}"
9688
fi
9789

@@ -139,7 +131,7 @@ case ${TARGET} in
139131
cargo_test "${PROFILE}"
140132
;;
141133

142-
# Setup aarch64 & armv7 specific variables, the runner, along with some
134+
# Setup aarch64 & armv7 specific variables, the runner, along with some
143135
# tests to skip
144136
aarch64-unknown-linux-gnu*)
145137
TEST_CPPFLAGS="-fuse-ld=lld -I/usr/aarch64-linux-gnu/include/ -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu/"

0 commit comments

Comments
 (0)