diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2019-10-30 18:18:49 +0100 |
|---|---|---|
| committer | Pietro Albini <pietro@pietroalbini.org> | 2019-11-12 11:06:11 +0100 |
| commit | d623c56f4c2eab00a9cb5ba12e9e708430945f1a (patch) | |
| tree | f0818a00a5064ee904d3efdd08d1afb2522ecce2 /src | |
| parent | 6104aa77eb97050c3b302a0d13934040de84cda9 (diff) | |
| download | rust-d623c56f4c2eab00a9cb5ba12e9e708430945f1a.tar.gz rust-d623c56f4c2eab00a9cb5ba12e9e708430945f1a.zip | |
ci: extract running the build into a script
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/azure-pipelines/steps/run.yml | 15 | ||||
| -rwxr-xr-x | src/ci/scripts/run-build-from-ci.sh | 21 |
2 files changed, 22 insertions, 14 deletions
diff --git a/src/ci/azure-pipelines/steps/run.yml b/src/ci/azure-pipelines/steps/run.yml index 4df315d5d5c..fe2bee50715 100644 --- a/src/ci/azure-pipelines/steps/run.yml +++ b/src/ci/azure-pipelines/steps/run.yml @@ -150,22 +150,9 @@ steps: condition: and(succeeded(), not(variables.SKIP_JOB), eq(variables['IMAGE'], 'mingw-check')) displayName: Verify the publish_toolstate script works -- bash: | - set -e - # Remove any preexisting rustup installation since it can interfere - # with the cargotest step and its auto-detection of things like Clippy in - # the environment - rustup self uninstall -y || true - if [ "$IMAGE" = "" ]; then - src/ci/run.sh - else - src/ci/docker/run.sh $IMAGE - fi - #timeoutInMinutes: 180 +- bash: src/ci/scripts/run-build-from-ci.sh timeoutInMinutes: 600 env: - CI: true - SRC: . AWS_ACCESS_KEY_ID: $(SCCACHE_AWS_ACCESS_KEY_ID) AWS_SECRET_ACCESS_KEY: $(SCCACHE_AWS_SECRET_ACCESS_KEY) TOOLSTATE_REPO_ACCESS_TOKEN: $(TOOLSTATE_REPO_ACCESS_TOKEN) diff --git a/src/ci/scripts/run-build-from-ci.sh b/src/ci/scripts/run-build-from-ci.sh new file mode 100755 index 00000000000..c02117f459d --- /dev/null +++ b/src/ci/scripts/run-build-from-ci.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# Start the CI build. You shouldn't run this locally: call either src/ci/run.sh +# or src/ci/docker/run.sh instead. + +set -euo pipefail +IFS=$'\n\t' + +source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" + +export CI="true" +export SRC=. + +# Remove any preexisting rustup installation since it can interfere +# with the cargotest step and its auto-detection of things like Clippy in +# the environment +rustup self uninstall -y || true +if [ -z "${IMAGE+x}" ]; then + src/ci/run.sh +else + src/ci/docker/run.sh "${IMAGE}" +fi |