diff --git a/.github/buildomat/build-and-test.sh b/.github/buildomat/build-and-test.sh index 1e4b655cb9..135ae7d3ea 100755 --- a/.github/buildomat/build-and-test.sh +++ b/.github/buildomat/build-and-test.sh @@ -89,6 +89,9 @@ ptime -m timeout 2h cargo nextest run --profile ci --locked --verbose banner doctest ptime -m timeout 1h cargo test --doc --locked --verbose --no-fail-fast +# Build the live-tests. (We can't actually run them here. See the README.) +ptime -m cargo xtask live-tests + # We expect the seed CRDB to be placed here, so we explicitly remove it so the # rmdir check below doesn't get triggered. Nextest doesn't have support for # teardown scripts so this is the best we've got. diff --git a/.github/buildomat/jobs/build-live-tests.sh b/.github/buildomat/jobs/build-live-tests.sh deleted file mode 100755 index c60c1048ba..0000000000 --- a/.github/buildomat/jobs/build-live-tests.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -#: -#: name = "build-live-tests" -#: variety = "basic" -#: target = "helios-2.0" -#: rust_toolchain = true -#: output_rules = [] - -# Builds the "live-tests" nextest archive - -set -o errexit -set -o pipefail -set -o xtrace - -cargo --version -rustc --version - -# -# Set up our PATH for use with this workspace. -# -source ./env.sh - -banner prerequisites -ptime -m bash ./tools/install_builder_prerequisites.sh -y - -banner live-tests -ptime -m cargo xtask live-tests