From d06f1fa5cb5eb9955e7bffa25a74c56eb045d772 Mon Sep 17 00:00:00 2001 From: Philipp Krones Date: Sat, 17 Jun 2023 10:32:31 +0200 Subject: [PATCH 1/4] Fix integration tests It sees like the `integration` test binary was no longer uploaded. I wonder how it was the successfully "run". First attempt to fix this. Also updates the artifacts actions to v3. --- .github/workflows/clippy_bors.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 4eb11a3ac857..4cfa13d78e9e 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -188,15 +188,15 @@ jobs: run: | DIR=$CARGO_TARGET_DIR/debug rm $DIR/deps/integration-*.d + rm $DIR/deps/integration-*.dwo mv $DIR/deps/integration-* $DIR/integration find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf - rm -rf $CARGO_TARGET_DIR/release - name: Upload Binaries - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: - name: target - path: target + name: $CARGO_TARGET_DIR/debug + path: $CARGO_TARGET_DIR/debug integration: needs: integration_build @@ -206,16 +206,13 @@ jobs: matrix: integration: - 'rust-lang/cargo' - # FIXME: re-enable once fmt_macros is renamed in RLS - # - 'rust-lang/rls' - 'rust-lang/chalk' - 'rust-lang/rustfmt' - 'Marwes/combine' - 'Geal/nom' - 'rust-lang/stdarch' - 'serde-rs/serde' - # FIXME: chrono currently cannot be compiled with `--all-targets` - # - 'chronotope/chrono' + - 'chronotope/chrono' - 'hyperium/hyper' - 'rust-random/rand' - 'rust-lang/futures-rs' @@ -239,10 +236,10 @@ jobs: # Download - name: Download target dir - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v3 with: - name: target - path: target + name: $CARGO_TARGET_DIR/debug + path: $CARGO_TARGET_DIR/debug - name: Make Binaries Executable run: chmod +x $CARGO_TARGET_DIR/debug/* From de698e40dcd3309f1ec57a4d261038c4bd26ea05 Mon Sep 17 00:00:00 2001 From: Philipp Krones Date: Sat, 17 Jun 2023 10:46:45 +0200 Subject: [PATCH 2/4] Second try? --- .github/workflows/clippy_bors.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 4cfa13d78e9e..a76bff20e18a 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -187,9 +187,7 @@ jobs: - name: Extract Binaries run: | DIR=$CARGO_TARGET_DIR/debug - rm $DIR/deps/integration-*.d - rm $DIR/deps/integration-*.dwo - mv $DIR/deps/integration-* $DIR/integration + find $DIR/deps/integration-* -executable ! -type d | xargs -I {} mv {} $DIR/integration find $DIR ! -executable -o -type d ! -path $DIR | xargs rm -rf - name: Upload Binaries From 4af568dca70e0550d4dfd692c12e5ec8e9cb04ab Mon Sep 17 00:00:00 2001 From: Philipp Krones Date: Sat, 17 Jun 2023 10:50:33 +0200 Subject: [PATCH 3/4] Thrid try? --- .github/workflows/clippy_bors.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index a76bff20e18a..30b3d231ecb8 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -193,8 +193,8 @@ jobs: - name: Upload Binaries uses: actions/upload-artifact@v3 with: - name: $CARGO_TARGET_DIR/debug - path: $CARGO_TARGET_DIR/debug + name: target/debug + path: target/debug integration: needs: integration_build @@ -236,8 +236,8 @@ jobs: - name: Download target dir uses: actions/download-artifact@v3 with: - name: $CARGO_TARGET_DIR/debug - path: $CARGO_TARGET_DIR/debug + name: target/debug + path: target/debug - name: Make Binaries Executable run: chmod +x $CARGO_TARGET_DIR/debug/* From 13a067bb0c5d3c903fdf0b83a3a2e84221ea70ed Mon Sep 17 00:00:00 2001 From: Philipp Krones Date: Sat, 17 Jun 2023 10:54:18 +0200 Subject: [PATCH 4/4] Fourth try for sure --- .github/workflows/clippy_bors.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clippy_bors.yml b/.github/workflows/clippy_bors.yml index 30b3d231ecb8..5869cd0b1a4a 100644 --- a/.github/workflows/clippy_bors.yml +++ b/.github/workflows/clippy_bors.yml @@ -193,7 +193,7 @@ jobs: - name: Upload Binaries uses: actions/upload-artifact@v3 with: - name: target/debug + name: binaries path: target/debug integration: @@ -236,7 +236,7 @@ jobs: - name: Download target dir uses: actions/download-artifact@v3 with: - name: target/debug + name: binaries path: target/debug - name: Make Binaries Executable