Skip to content

Commit 0cbf61f

Browse files
committed
Only upload binaries
1 parent 01fbcb9 commit 0cbf61f

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/clippy_bors.yml

+12-8
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,14 @@ jobs:
173173
- name: Master Toolchain Setup
174174
run: bash setup-toolchain.sh
175175

176-
- name: Build Clippy
177-
run: cargo build --features integration
178-
- name: Upload target dir
176+
- name: Build Integration Test
177+
run: cargo test --test integration --features integration --no-run
178+
- name: Extract Binaries
179+
run: |
180+
DIR=$CARGO_TARGET_DIR/debug
181+
find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
182+
mv $DIR/integration-* $DIR/integration
183+
- name: Upload Binaries
179184
uses: actions/upload-artifact@v1
180185
with:
181186
name: target
@@ -236,14 +241,13 @@ jobs:
236241
with:
237242
name: target
238243
path: target
239-
- name: Debug
240-
run: |
241-
ls target
242-
exit 1
244+
- name: Make Binaries Executable
245+
run: chmod +x $CARGO_TARGET_DIR/debug/*
243246
- name: Test ${{ matrix.integration }}
244-
run: cargo test --test integration --features integration
247+
run: $CARGO_TARGET_DIR/debug/integration
245248
env:
246249
INTEGRATION: ${{ matrix.integration }}
250+
RUSTUP_TOOLCHAIN: master
247251

248252
- name: Run cargo-cache --autoclean
249253
run: |

tests/integration.rs

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ fn integration_test() {
5959
panic!("query stack during panic in the output");
6060
} else if stderr.contains("E0463") {
6161
panic!("error: E0463");
62+
} else if stderr.contains("E0514") {
63+
panic!("incompatible crate versions");
64+
} else if stderr.contains("failed to run `rustc` to learn about target-specific information") {
65+
panic!("couldn't find librustc_driver, consider setting `LD_LIBRARY_PATH`");
6266
}
6367

6468
match output.status.code() {

0 commit comments

Comments
 (0)