ci: remove trailing whitespaces from azure config

This commit is contained in:
Pietro Albini 2019-05-13 09:55:12 +02:00
parent 5db55e6fe0
commit da949780f0
No known key found for this signature in database
GPG Key ID: 3E06ABE80BAAF19C
7 changed files with 18 additions and 18 deletions

View File

@ -1,6 +1,6 @@
# #
# Azure Pipelines "auto" branch build for Rust on Linux, macOS, and Windows. # Azure Pipelines "auto" branch build for Rust on Linux, macOS, and Windows.
# #
pr: none pr: none
trigger: trigger:
@ -33,7 +33,7 @@ jobs:
IMAGE: dist-x86_64-linux IMAGE: dist-x86_64-linux
DEPLOY_ALT: 1 DEPLOY_ALT: 1
# Linux builders, remaining docker images # Linux builders, remaining docker images
arm-android: arm-android:
IMAGE: arm-android IMAGE: arm-android
@ -157,7 +157,7 @@ jobs:
steps: steps:
- checkout: self - checkout: self
fetchDepth: 2 fetchDepth: 2
- template: steps/macos.yml - template: steps/macos.yml
strategy: strategy:
matrix: matrix:
# macOS builders. These are placed near the beginning because they are very # macOS builders. These are placed near the beginning because they are very
@ -200,7 +200,7 @@ jobs:
# # temp disabled # # temp disabled
# # https://github.com/johnterickson/rust/issues/18 # # https://github.com/johnterickson/rust/issues/18
# i686-apple: # i686-apple:
# RUST_CHECK_TARGET: check # RUST_CHECK_TARGET: check
# RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
# MACOSX_DEPLOYMENT_TARGET: 10.8 # MACOSX_DEPLOYMENT_TARGET: 10.8

View File

@ -9,7 +9,7 @@ trigger:
pool: pool:
vmImage: ubuntu-16.04 vmImage: ubuntu-16.04
steps: steps:
- checkout: self - checkout: self
fetchDepth: 2 fetchDepth: 2
@ -19,6 +19,6 @@ steps:
# FIXME(pietro): committing is disabled until we switch to Azure Pipelines # FIXME(pietro): committing is disabled until we switch to Azure Pipelines
# as the source of truth, or until we setup a separate test repo. # as the source of truth, or until we setup a separate test repo.
#commit_toolstate_change "$MESSAGE_FILE" "$BUILD_SOURCESDIRECTORY/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE" "$TOOLSTATE_REPO_ACCESS_TOKEN" #commit_toolstate_change "$MESSAGE_FILE" "$BUILD_SOURCESDIRECTORY/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "$MESSAGE_FILE" "$TOOLSTATE_REPO_ACCESS_TOKEN"
displayName: Publish toolstate displayName: Publish toolstate
env: env:
TOOLSTATE_REPO_ACCESS_TOKEN: $(TOOLSTATE_REPO_ACCESS_TOKEN_SECRET) TOOLSTATE_REPO_ACCESS_TOKEN: $(TOOLSTATE_REPO_ACCESS_TOKEN_SECRET)

View File

@ -1,6 +1,6 @@
# #
# Azure Pipelines pull request build for Rust # Azure Pipelines pull request build for Rust
# #
trigger: none trigger: none
pr: pr:
@ -20,7 +20,7 @@ jobs:
matrix: matrix:
x86_64-gnu-llvm-6.0: x86_64-gnu-llvm-6.0:
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
x86_64-gnu-tools: {} x86_64-gnu-tools: {}
# if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/) # if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/)
mingw-check: {} mingw-check: {}

View File

@ -7,10 +7,10 @@ steps:
- bash: | - bash: |
sudo apt install gdb sudo apt install gdb
curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl curl -fo $HOME/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-unknown-linux-musl
chmod +x $HOME/stamp chmod +x $HOME/stamp
export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/:$HOME export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/:$HOME
echo "##vso[task.setvariable variable=PATH;]$PATH" echo "##vso[task.setvariable variable=PATH;]$PATH"

View File

@ -25,9 +25,9 @@ steps:
displayName: install a tar that works well displayName: install a tar that works well
- bash: | - bash: |
curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf -
displayName: Download clang displayName: Download clang
- bash: | - bash: |
brew update brew update
brew install xz brew install xz

View File

@ -7,7 +7,7 @@ steps:
git submodule git submodule
export SUBMODULES_EXCLUDES=$(git submodule | grep -Eow 'src/[^ ]+' | sed 's/\(.*\)/--exclude=\1\/\.git/') export SUBMODULES_EXCLUDES=$(git submodule | grep -Eow 'src/[^ ]+' | sed 's/\(.*\)/--exclude=\1\/\.git/')
echo "##vso[task.setvariable variable=SUBMODULES_EXCLUDES;]$SUBMODULES_EXCLUDES" echo "##vso[task.setvariable variable=SUBMODULES_EXCLUDES;]$SUBMODULES_EXCLUDES"
- script: | - script: |
REM echo hack as drive D is too small REM echo hack as drive D is too small
IF NOT "%DISABLE_DISK_SPACE_HACK%"=="1" ( IF NOT "%DISABLE_DISK_SPACE_HACK%"=="1" (
@ -19,7 +19,7 @@ steps:
set MSYS_PATH=%CD%\citools\msys64 set MSYS_PATH=%CD%\citools\msys64
choco install msys2 --params="/InstallDir:%MSYS_PATH% /NoPath" -y choco install msys2 --params="/InstallDir:%MSYS_PATH% /NoPath" -y
set PATH=%MSYS_PATH%\usr\bin;%PATH% set PATH=%MSYS_PATH%\usr\bin;%PATH%
pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar
IF "%MINGW_URL%"=="" ( IF "%MINGW_URL%"=="" (
IF "%MSYS_BITS%"=="32" pacman -S --noconfirm --needed mingw-w64-i686-toolchain mingw-w64-i686-cmake mingw-w64-i686-gcc mingw-w64-i686-python2 IF "%MSYS_BITS%"=="32" pacman -S --noconfirm --needed mingw-w64-i686-toolchain mingw-w64-i686-cmake mingw-w64-i686-gcc mingw-w64-i686-python2
IF "%MSYS_BITS%"=="64" pacman -S --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-gcc mingw-w64-x86_64-python2 IF "%MSYS_BITS%"=="64" pacman -S --noconfirm --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-gcc mingw-w64-x86_64-python2
@ -135,7 +135,7 @@ steps:
- script: | - script: |
REM echo force the specific VS version https://github.com/johnterickson/rust/issues/8 REM echo force the specific VS version https://github.com/johnterickson/rust/issues/8
IF "%VCVARS_BAT%" NEQ "" ( IF "%VCVARS_BAT%" NEQ "" (
CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\%VCVARS_BAT%" CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\%VCVARS_BAT%"
) )
@ -144,10 +144,10 @@ steps:
set | findstr /v SCCACHE_AZURE_CONNECTION_STRING set | findstr /v SCCACHE_AZURE_CONNECTION_STRING
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
sh src/ci/run.sh sh src/ci/run.sh
env: env:
CI: true CI: true
CI_JOB_NAME: $(System.JobDisplayName) CI_JOB_NAME: $(System.JobDisplayName)
SRC: . SRC: .

View File

@ -1,6 +1,6 @@
# #
# Azure Pipelines "try" branch build for Rust # Azure Pipelines "try" branch build for Rust
# #
pr: none pr: none
trigger: trigger: