From a6868c614a05353858a2f0c2314d64b2e8c387d0 Mon Sep 17 00:00:00 2001 From: Urgau Date: Mon, 23 Oct 2023 17:07:14 +0200 Subject: [PATCH] [DO NOT MERGE] Enable dist-x86_64-linux with tests on PR CI a --- .github/workflows/ci.yml | 4 ++++ src/ci/github-actions/ci.yml | 6 ++++++ src/ci/run.sh | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f91e6816ae426..9c5defd53db28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,6 +59,10 @@ jobs: - name: x86_64-gnu-llvm-15 os: ubuntu-20.04-16core-64gb env: {} + - name: dist-x86_64-linux + env: + PR_CI_JOB: 0 + os: ubuntu-20.04-16core-64gb - name: x86_64-gnu-tools os: ubuntu-20.04-16core-64gb env: {} diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 2577682c57c67..701a5c48db232 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -333,6 +333,12 @@ jobs: - name: x86_64-gnu-llvm-15 <<: *job-linux-16c + - &dist-x86_64-linux + name: dist-x86_64-linux + env: + PR_CI_JOB: 0 + <<: *job-linux-16c + - name: x86_64-gnu-tools <<: *job-linux-16c diff --git a/src/ci/run.sh b/src/ci/run.sh index abeff7b837dcd..7d872debdba1d 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -47,8 +47,9 @@ source "$ci_dir/shared.sh" export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse -if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \ - isCiBranch automation/bors/try; then +# if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \ +# isCiBranch automation/bors/try; then +if true; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.metrics" HAS_METRICS=1