Skip to content

Commit b8a970c

Browse files
committed
ci: run the prebuilt extended test binary without Cargo locking
1 parent 3d93a70 commit b8a970c

3 files changed

Lines changed: 22 additions & 6 deletions

File tree

‎.github/workflows/ci-opts.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,17 @@ jobs:
176176
df -h
177177
# Give the longest-running suite the build lock before the other Cargo commands.
178178
- name: Build extended tests
179-
run: cargo xtask ci step test extended-build
179+
run: |
180+
cargo xtask ci step test extended-build > "$RUNNER_TEMP/extended-tests.json"
181+
extended_test_binary="$(jq -Rr 'fromjson? | select(.reason == "compiler-artifact" and .target.name == "extended_tests" and .executable != null) | .executable' "$RUNNER_TEMP/extended-tests.json")"
182+
test -x "$extended_test_binary"
183+
printf 'EXTENDED_TEST_BINARY=%s\n' "$extended_test_binary" >> "$GITHUB_ENV"
180184
- parallel:
181185
- name: Run extended tests
182-
run: cargo xtask ci step test extended
186+
run: '"$EXTENDED_TEST_BINARY"'
187+
working-directory: datafusion/core
188+
env:
189+
RUST_BACKTRACE: "1"
183190
- name: Run fuzz tests
184191
run: cargo xtask ci step test fuzz
185192
# Migrate it to the above unified fuzz runner over time

‎.github/workflows/extended.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,17 @@ jobs:
7171
df -h
7272
# Give the longest-running suite the build lock before the other Cargo commands.
7373
- name: Build extended tests
74-
run: cargo xtask ci step test extended-build
74+
run: |
75+
cargo xtask ci step test extended-build > "$RUNNER_TEMP/extended-tests.json"
76+
extended_test_binary="$(jq -Rr 'fromjson? | select(.reason == "compiler-artifact" and .target.name == "extended_tests" and .executable != null) | .executable' "$RUNNER_TEMP/extended-tests.json")"
77+
test -x "$extended_test_binary"
78+
printf 'EXTENDED_TEST_BINARY=%s\n' "$extended_test_binary" >> "$GITHUB_ENV"
7579
- parallel:
7680
- name: Run extended tests
77-
run: cargo xtask ci step test extended
81+
run: '"$EXTENDED_TEST_BINARY"'
82+
working-directory: datafusion/core
83+
env:
84+
RUST_BACKTRACE: "1"
7885
- name: Run fuzz tests
7986
run: cargo xtask ci step test fuzz
8087
# Migrate it to the above unified fuzz runner over time

‎xtask/src/ci_steps.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,8 @@ impl StepContext {
469469
])
470470
.env("RUST_BACKTRACE", "1");
471471
if variant == "extended-build" {
472-
cmd_builder.args(["--no-run"]);
472+
cmd_builder
473+
.args(["--no-run", "--message-format=json-render-diagnostics"]);
473474
}
474475
}
475476
"fuzz" => {
@@ -985,7 +986,8 @@ cargo test \
985986
-p datafusion-fuzz \
986987
--test extended_tests \
987988
--features avro,backtrace,extended_tests,parquet_encryption \
988-
--no-run
989+
--no-run \
990+
--message-format=json-render-diagnostics
989991
")
990992
},
991993
},

0 commit comments

Comments
 (0)