Skip to content

Commit

Permalink
Auto merge of rust-lang#113786 - Kobzol:ci-disable-dist-tests, r=Mark…
Browse files Browse the repository at this point in the history
…-Simulacrum

Disable dist tests on beta/stable

Should resolve the beta/stable part of rust-lang#113784. To be extra safe, I also made the read of `RUST_RELEASE_CHANNEL` optional, just in case it was missing.

r? `@Mark-Simulacrum`
  • Loading branch information
bors committed Aug 1, 2023
2 parents a47f796 + 26a314b commit efb1be3
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/ci/stage-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
Tuple, Union

PGO_HOST = os.environ["PGO_HOST"]
CHANNEL = os.environ["RUST_RELEASE_CHANNEL"]
CHANNEL = os.environ.get("RUST_RELEASE_CHANNEL", "")

LOGGER = logging.getLogger("stage-build")

Expand Down Expand Up @@ -993,9 +993,10 @@ def execute_build_pipeline(timer: Timer, pipeline: Pipeline, runner: BenchmarkRu
record_metrics(pipeline, final_stage)

# Try builds can be in various broken states, so we don't want to gatekeep them with tests
if not is_try_build():
with timer.section("Run tests"):
run_tests(pipeline)
# Do not run tests, as they are broken for beta/stable versions in this script
# if not is_try_build():
# with timer.section("Run tests"):
# run_tests(pipeline)


def run(runner: BenchmarkRunner):
Expand Down

0 comments on commit efb1be3

Please sign in to comment.