From da949780f099f48066e77235d5ccff7f430b3323 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Mon, 13 May 2019 09:55:12 +0200 Subject: [PATCH] ci: remove trailing whitespaces from azure config --- .azure-pipelines/auto.yml | 8 ++++---- .azure-pipelines/master.yml | 4 ++-- .azure-pipelines/pr.yml | 4 ++-- .azure-pipelines/steps/linux.yml | 4 ++-- .azure-pipelines/steps/macos.yml | 4 ++-- .azure-pipelines/steps/windows.yml | 10 +++++----- .azure-pipelines/try.yml | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.azure-pipelines/auto.yml b/.azure-pipelines/auto.yml index e8959e3f17c..3ee52050e2c 100644 --- a/.azure-pipelines/auto.yml +++ b/.azure-pipelines/auto.yml @@ -1,6 +1,6 @@ # # Azure Pipelines "auto" branch build for Rust on Linux, macOS, and Windows. -# +# pr: none trigger: @@ -33,7 +33,7 @@ jobs: IMAGE: dist-x86_64-linux DEPLOY_ALT: 1 - # Linux builders, remaining docker images + # Linux builders, remaining docker images arm-android: IMAGE: arm-android @@ -157,7 +157,7 @@ jobs: steps: - checkout: self fetchDepth: 2 - - template: steps/macos.yml + - template: steps/macos.yml strategy: matrix: # macOS builders. These are placed near the beginning because they are very @@ -200,7 +200,7 @@ jobs: # # temp disabled # # https://github.com/johnterickson/rust/issues/18 # i686-apple: - # RUST_CHECK_TARGET: check + # RUST_CHECK_TARGET: check # RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --set rust.jemalloc # RUSTC_RETRY_LINKER_ON_SEGFAULT: 1 # MACOSX_DEPLOYMENT_TARGET: 10.8 diff --git a/.azure-pipelines/master.yml b/.azure-pipelines/master.yml index 5e8f87759d8..624b5e8fab0 100644 --- a/.azure-pipelines/master.yml +++ b/.azure-pipelines/master.yml @@ -9,7 +9,7 @@ trigger: pool: vmImage: ubuntu-16.04 -steps: +steps: - checkout: self fetchDepth: 2 @@ -19,6 +19,6 @@ steps: # FIXME(pietro): committing is disabled until we switch to Azure Pipelines # 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" - displayName: Publish toolstate + displayName: Publish toolstate env: TOOLSTATE_REPO_ACCESS_TOKEN: $(TOOLSTATE_REPO_ACCESS_TOKEN_SECRET) diff --git a/.azure-pipelines/pr.yml b/.azure-pipelines/pr.yml index ffdb4301e93..5161b8aafbf 100644 --- a/.azure-pipelines/pr.yml +++ b/.azure-pipelines/pr.yml @@ -1,6 +1,6 @@ # # Azure Pipelines pull request build for Rust -# +# trigger: none pr: @@ -20,7 +20,7 @@ jobs: matrix: x86_64-gnu-llvm-6.0: RUST_BACKTRACE: 1 - + x86_64-gnu-tools: {} # if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/) mingw-check: {} diff --git a/.azure-pipelines/steps/linux.yml b/.azure-pipelines/steps/linux.yml index b347549ccb7..3e83f0dcaaa 100644 --- a/.azure-pipelines/steps/linux.yml +++ b/.azure-pipelines/steps/linux.yml @@ -7,10 +7,10 @@ steps: - bash: | 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 chmod +x $HOME/stamp - + export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/:$HOME echo "##vso[task.setvariable variable=PATH;]$PATH" diff --git a/.azure-pipelines/steps/macos.yml b/.azure-pipelines/steps/macos.yml index e88b5613e46..d1adc340392 100644 --- a/.azure-pipelines/steps/macos.yml +++ b/.azure-pipelines/steps/macos.yml @@ -25,9 +25,9 @@ steps: displayName: install a tar that works well - 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 - + - bash: | brew update brew install xz diff --git a/.azure-pipelines/steps/windows.yml b/.azure-pipelines/steps/windows.yml index e3c06d543a9..cc11e7a0836 100644 --- a/.azure-pipelines/steps/windows.yml +++ b/.azure-pipelines/steps/windows.yml @@ -7,7 +7,7 @@ steps: git submodule export SUBMODULES_EXCLUDES=$(git submodule | grep -Eow 'src/[^ ]+' | sed 's/\(.*\)/--exclude=\1\/\.git/') echo "##vso[task.setvariable variable=SUBMODULES_EXCLUDES;]$SUBMODULES_EXCLUDES" - + - script: | REM echo hack as drive D is too small IF NOT "%DISABLE_DISK_SPACE_HACK%"=="1" ( @@ -19,7 +19,7 @@ steps: set MSYS_PATH=%CD%\citools\msys64 choco install msys2 --params="/InstallDir:%MSYS_PATH% /NoPath" -y 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 "%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 @@ -135,7 +135,7 @@ steps: - script: | 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%" ) @@ -144,10 +144,10 @@ steps: set | findstr /v SCCACHE_AZURE_CONNECTION_STRING if not exist D:\cache\rustsrc\NUL mkdir D:\cache\rustsrc - + sh src/ci/init_repo.sh . /d/cache/rustsrc sh src/ci/run.sh - env: + env: CI: true CI_JOB_NAME: $(System.JobDisplayName) SRC: . diff --git a/.azure-pipelines/try.yml b/.azure-pipelines/try.yml index eaa50729b0d..229927f4d34 100644 --- a/.azure-pipelines/try.yml +++ b/.azure-pipelines/try.yml @@ -1,6 +1,6 @@ # # Azure Pipelines "try" branch build for Rust -# +# pr: none trigger: