ci: extract running the build into a script

This commit is contained in:
Pietro Albini 2019-10-30 18:18:49 +01:00
parent 6104aa77eb
commit d623c56f4c
No known key found for this signature in database
GPG Key ID: 3E06ABE80BAAF19C
2 changed files with 22 additions and 14 deletions

View File

@ -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)

View File

@ -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