about summary refs log tree commit diff
path: root/src/ci/azure-pipelines
diff options
context:
space:
mode:
authorPietro Albini <pietro@pietroalbini.org>2019-10-30 18:18:49 +0100
committerPietro Albini <pietro@pietroalbini.org>2019-11-12 11:06:11 +0100
commitd623c56f4c2eab00a9cb5ba12e9e708430945f1a (patch)
treef0818a00a5064ee904d3efdd08d1afb2522ecce2 /src/ci/azure-pipelines
parent6104aa77eb97050c3b302a0d13934040de84cda9 (diff)
downloadrust-d623c56f4c2eab00a9cb5ba12e9e708430945f1a.tar.gz
rust-d623c56f4c2eab00a9cb5ba12e9e708430945f1a.zip
ci: extract running the build into a script
Diffstat (limited to 'src/ci/azure-pipelines')
-rw-r--r--src/ci/azure-pipelines/steps/run.yml15
1 files changed, 1 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)