Skip to content

Commit caf6335

Browse files
committed
Attempt to fix CI
1 parent 8d05165 commit caf6335

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/main.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616

17+
- name: Install packages
18+
run: sudo apt-get install ninja-build
19+
1720
- name: Download artifact
1821
uses: dawidd6/action-download-artifact@v2
1922
with:
@@ -59,12 +62,6 @@ jobs:
5962
path: target
6063
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }}
6164

62-
- name: Cache Rust repo
63-
uses: actions/[email protected]
64-
with:
65-
path: rust
66-
key: ${{ runner.os }}-rust-${{ hashFiles('rust-toolchain') }}
67-
6865
- name: Prepare dependencies
6966
run: |
7067
git config --global user.email "[email protected]"

test.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ cat > config.toml <<EOF
155155
[rust]
156156
codegen-backends = []
157157
[build]
158-
cargo = "/usr/bin/cargo"
158+
cargo = "$(which cargo)"
159159
local-rebuild = true
160160
rustc = "$HOME/.rustup/toolchains/$rust_toolchain-$TARGET_TRIPLE/bin/rustc"
161161
EOF
@@ -173,7 +173,8 @@ done
173173
#rm src/test/ui/macros/same-sequence-span.rs || true # Proc macro .rustc section not found?
174174
#rm src/test/ui/suggestions/issue-61963.rs || true # ^
175175

176-
#RUSTC_ARGS="-Zpanic-abort-tests -Zcodegen-backend="$(pwd)"/../target/"$CHANNEL"/librustc_codegen_gcc."$dylib_ext" --sysroot "$(pwd)"/../build_sysroot/sysroot -Cpanic=abort"
176+
RUSTC_ARGS="-Zpanic-abort-tests -Zcodegen-backend="$(pwd)"/../target/"$CHANNEL"/librustc_codegen_gcc."$dylib_ext" --sysroot "$(pwd)"/../build_sysroot/sysroot -Cpanic=abort"
177177

178178
echo "[TEST] rustc test suite"
179-
COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 src/test/ui/ --rustc-args "$RUSTC_ARGS" 2>&1 | tee log.txt
179+
# TODO: remove excluded tests when they stop stalling.
180+
COMPILETEST_FORCE_STAGE0=1 ./x.py test --run always --stage 0 src/test/ui/ --rustc-args "$RUSTC_ARGS" --exclude src/test/ui/numbers-arithmetic/saturating-float-casts.rs --exclude src/test/ui/issues/issue-50811.rs

0 commit comments

Comments
 (0)