Only execute conditional steps on success
Make sure `succeeded()` is in all the conditionals
This commit is contained in:
parent
9b8af0608f
commit
12f370156d
@ -14,7 +14,7 @@ steps:
|
|||||||
# `clang-ar` by accident.
|
# `clang-ar` by accident.
|
||||||
echo "##vso[task.setvariable variable=AR]ar"
|
echo "##vso[task.setvariable variable=AR]ar"
|
||||||
displayName: Install clang (OSX)
|
displayName: Install clang (OSX)
|
||||||
condition: eq(variables['Agent.OS'], 'Darwin')
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
|
||||||
|
|
||||||
# If we're compiling for MSVC then we, like most other distribution builders,
|
# If we're compiling for MSVC then we, like most other distribution builders,
|
||||||
# switch to clang as the compiler. This'll allow us eventually to enable LTO
|
# switch to clang as the compiler. This'll allow us eventually to enable LTO
|
||||||
@ -32,7 +32,7 @@ steps:
|
|||||||
%TEMP%\LLVM-7.0.0-win64.exe /S /NCRC /D=%CLANG_DIR%
|
%TEMP%\LLVM-7.0.0-win64.exe /S /NCRC /D=%CLANG_DIR%
|
||||||
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=%CLANG_DIR%\bin\clang-cl.exe
|
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=%CLANG_DIR%\bin\clang-cl.exe
|
||||||
echo ##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]%RUST_CONFIGURE_ARGS%
|
echo ##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]%RUST_CONFIGURE_ARGS%
|
||||||
condition: and(eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
|
||||||
displayName: Install clang (Windows)
|
displayName: Install clang (Windows)
|
||||||
|
|
||||||
# Note that we don't install clang on Linux since its compiler story is just so
|
# Note that we don't install clang on Linux since its compiler story is just so
|
||||||
|
@ -5,14 +5,14 @@ steps:
|
|||||||
curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin
|
curl -fo /usr/local/bin/sccache https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-apple-darwin
|
||||||
chmod +x /usr/local/bin/sccache
|
chmod +x /usr/local/bin/sccache
|
||||||
displayName: Install sccache (OSX)
|
displayName: Install sccache (OSX)
|
||||||
condition: eq(variables['Agent.OS'], 'Darwin')
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
|
||||||
|
|
||||||
- script: |
|
- script: |
|
||||||
md sccache
|
md sccache
|
||||||
powershell -Command "iwr -outf sccache\sccache.exe https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc"
|
powershell -Command "iwr -outf sccache\sccache.exe https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc"
|
||||||
echo ##vso[task.prependpath]%CD%\sccache
|
echo ##vso[task.prependpath]%CD%\sccache
|
||||||
displayName: Install sccache (Windows)
|
displayName: Install sccache (Windows)
|
||||||
condition: eq(variables['Agent.OS'], 'Windows_NT')
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
|
||||||
|
|
||||||
# Note that we don't install sccache on Linux since it's installed elsewhere
|
# Note that we don't install sccache on Linux since it's installed elsewhere
|
||||||
# through all the containers.
|
# through all the containers.
|
||||||
|
@ -29,7 +29,7 @@ steps:
|
|||||||
echo ##vso[task.setvariable variable=MSYS_PATH]%MSYS_PATH%
|
echo ##vso[task.setvariable variable=MSYS_PATH]%MSYS_PATH%
|
||||||
echo ##vso[task.prependpath]%MSYS_PATH%\usr\bin
|
echo ##vso[task.prependpath]%MSYS_PATH%\usr\bin
|
||||||
displayName: Install msys2
|
displayName: Install msys2
|
||||||
condition: eq(variables['Agent.OS'], 'Windows_NT')
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
|
||||||
|
|
||||||
# If we need to download a custom MinGW, do so here and set the path
|
# If we need to download a custom MinGW, do so here and set the path
|
||||||
# appropriately.
|
# appropriately.
|
||||||
|
@ -12,12 +12,18 @@ steps:
|
|||||||
# images, etc.
|
# images, etc.
|
||||||
- bash: |
|
- bash: |
|
||||||
set -e
|
set -e
|
||||||
pip install setuptools
|
sudo apt-get install -y python3-setuptools
|
||||||
pip install awscli
|
pip3 install awscli --upgrade --user
|
||||||
displayName: Install awscli
|
echo "##vso[task.prependpath]$HOME/.local/bin"
|
||||||
|
displayName: Install awscli (Linux)
|
||||||
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
|
||||||
|
- script: pip install awscli
|
||||||
|
displayName: Install awscli (non-Linux)
|
||||||
|
condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
|
||||||
|
|
||||||
- bash: aws s3 help
|
- bash: aws s3 help
|
||||||
- bash: exit 1
|
- bash: exit 1
|
||||||
|
|
||||||
- checkout: self
|
- checkout: self
|
||||||
fetchDepth: 2
|
fetchDepth: 2
|
||||||
|
|
||||||
@ -30,7 +36,7 @@ steps:
|
|||||||
du . | sort -nr | head -n100
|
du . | sort -nr | head -n100
|
||||||
displayName: Show disk usage
|
displayName: Show disk usage
|
||||||
# FIXME: this hasn't been tested, but maybe it works on Windows? Should test!
|
# FIXME: this hasn't been tested, but maybe it works on Windows? Should test!
|
||||||
condition: ne(variables['Agent.OS'], 'Windows_NT')
|
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
|
||||||
|
|
||||||
- template: install-sccache.yml
|
- template: install-sccache.yml
|
||||||
- template: install-clang.yml
|
- template: install-clang.yml
|
||||||
@ -43,7 +49,7 @@ steps:
|
|||||||
brew install xz
|
brew install xz
|
||||||
brew install swig
|
brew install swig
|
||||||
displayName: Install build dependencies (OSX)
|
displayName: Install build dependencies (OSX)
|
||||||
condition: and(eq(variables['Agent.OS'], 'Darwin'), eq(variables['RUST_CHECK_TARGET'],'dist'))
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'), eq(variables['RUST_CHECK_TARGET'],'dist'))
|
||||||
|
|
||||||
- template: install-windows-build-deps.yml
|
- template: install-windows-build-deps.yml
|
||||||
|
|
||||||
@ -53,12 +59,12 @@ steps:
|
|||||||
set -e
|
set -e
|
||||||
mkdir -p $HOME/rustsrc
|
mkdir -p $HOME/rustsrc
|
||||||
$BUILD_SOURCESDIRECTORY/src/ci/init_repo.sh . $HOME/rustsrc
|
$BUILD_SOURCESDIRECTORY/src/ci/init_repo.sh . $HOME/rustsrc
|
||||||
condition: ne(variables['Agent.OS'], 'Windows_NT')
|
condition: and(succeeded(), ne(variables['Agent.OS'], 'Windows_NT'))
|
||||||
displayName: Check out submodules (Unix)
|
displayName: Check out submodules (Unix)
|
||||||
- script: |
|
- script: |
|
||||||
if not exist D:\cache\rustsrc\NUL mkdir D:\cache\rustsrc
|
if not exist D:\cache\rustsrc\NUL mkdir D:\cache\rustsrc
|
||||||
sh src/ci/init_repo.sh . /d/cache/rustsrc
|
sh src/ci/init_repo.sh . /d/cache/rustsrc
|
||||||
condition: eq(variables['Agent.OS'], 'Windows_NT')
|
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
|
||||||
displayName: Check out submodules (Windows)
|
displayName: Check out submodules (Windows)
|
||||||
|
|
||||||
# Configure our CI_JOB_NAME variable which log analyzers can use for the main
|
# Configure our CI_JOB_NAME variable which log analyzers can use for the main
|
||||||
|
Loading…
x
Reference in New Issue
Block a user