Skip to content

Commit 9c6dd5d

Browse files
committed
Auto merge of #11225 - matthiaskrgr:fix_integration_tests2, r=<try>
[wip] Fix integration tests2 wip wap wup changelog: lolno
2 parents d09c8a9 + b84fb9b commit 9c6dd5d

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

.github/workflows/clippy_bors.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ jobs:
3030
with:
3131
ref: ${{ github.ref }}
3232

33+
- name: Set LD_LIBRARY_PATH
34+
run: |
35+
SYSROOT=$(rustc --print sysroot)
36+
echo "LD_LIBRARY_PATH=${SYSROOT}/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}" >> $GITHUB_ENV
37+
3338
# Run
3439
- name: Check Changelog
3540
run: |
@@ -187,16 +192,14 @@ jobs:
187192
- name: Extract Binaries
188193
run: |
189194
DIR=$CARGO_TARGET_DIR/debug
190-
rm $DIR/deps/integration-*.d
191-
mv $DIR/deps/integration-* $DIR/integration
195+
find $DIR/deps/integration-* -executable ! -type d | xargs -I {} mv {} $DIR/integration
192196
find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf
193-
rm -rf $CARGO_TARGET_DIR/release
194197
195198
- name: Upload Binaries
196-
uses: actions/upload-artifact@v1
199+
uses: actions/upload-artifact@v3
197200
with:
198-
name: target
199-
path: target
201+
name: binaries
202+
path: target/debug
200203

201204
integration:
202205
needs: integration_build
@@ -206,16 +209,13 @@ jobs:
206209
matrix:
207210
integration:
208211
- 'rust-lang/cargo'
209-
# FIXME: re-enable once fmt_macros is renamed in RLS
210-
# - 'rust-lang/rls'
211212
- 'rust-lang/chalk'
212213
- 'rust-lang/rustfmt'
213214
- 'Marwes/combine'
214215
- 'Geal/nom'
215216
- 'rust-lang/stdarch'
216217
- 'serde-rs/serde'
217-
# FIXME: chrono currently cannot be compiled with `--all-targets`
218-
# - 'chronotope/chrono'
218+
- 'chronotope/chrono'
219219
- 'hyperium/hyper'
220220
- 'rust-random/rand'
221221
- 'rust-lang/futures-rs'
@@ -239,10 +239,10 @@ jobs:
239239

240240
# Download
241241
- name: Download target dir
242-
uses: actions/download-artifact@v1
242+
uses: actions/download-artifact@v3
243243
with:
244-
name: target
245-
path: target
244+
name: binaries
245+
path: target/debug
246246

247247
- name: Make Binaries Executable
248248
run: chmod +x $CARGO_TARGET_DIR/debug/*

tests/integration.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ fn integration_test() {
6565
.expect("unable to run clippy");
6666

6767
let stderr = String::from_utf8_lossy(&output.stderr);
68+
69+
// debug:
70+
eprintln!("{stderr}");
71+
6872
if let Some(backtrace_start) = stderr.find("error: internal compiler error") {
6973
static BACKTRACE_END_MSG: &str = "end of query stack";
7074
let backtrace_end = stderr[backtrace_start..]

0 commit comments

Comments
 (0)