From: kennytm Date: Thu, 5 Apr 2018 17:09:59 +0000 (+0800) Subject: Give a name to every CI job. X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=649f431acfaff1bcaad56f63b19c28499fb75964;p=rust.git Give a name to every CI job. Bots that read the log can simply look for `[CI_JOB_NAME=...]` to find out the job's name. --- diff --git a/.travis.yml b/.travis.yml index 36329ab9114..f36ad67b111 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: # "alternate" deployments, these are "nightlies" but have LLVM assertions # turned on, they're deployed to a different location primarily for # additional testing. - - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 + - env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1 CI_JOB_NAME=dist-x86_64-linux-alt if: branch = try OR branch = auto - env: > @@ -33,6 +33,7 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 + CI_JOB_NAME=dist-x86_64-apple-alt os: osx osx_image: xcode9.3-moar if: branch = auto @@ -53,6 +54,7 @@ matrix: MACOSX_STD_DEPLOYMENT_TARGET=10.7 NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 + CI_JOB_NAME=x86_64-apple os: osx osx_image: xcode9.3-moar if: branch = auto @@ -66,6 +68,7 @@ matrix: MACOSX_STD_DEPLOYMENT_TARGET=10.7 NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 + CI_JOB_NAME=i686-apple os: osx osx_image: xcode9.3-moar if: branch = auto @@ -85,6 +88,7 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 + CI_JOB_NAME=dist-i686-apple os: osx osx_image: xcode9.3-moar if: branch = auto @@ -98,6 +102,7 @@ matrix: MACOSX_DEPLOYMENT_TARGET=10.7 NO_LLVM_ASSERTIONS=1 NO_DEBUG_ASSERTIONS=1 + CI_JOB_NAME=dist-x86_64-apple os: osx osx_image: xcode9.3-moar if: branch = auto diff --git a/appveyor.yml b/appveyor.yml index 09c6fca5d02..a15f3dd8d5c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,25 +18,31 @@ environment: - MSYS_BITS: 64 RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: python x.py test + CI_JOB_NAME: x86_64-msvc - MSYS_BITS: 32 RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc SCRIPT: make appveyor-subset-1 + CI_JOB_NAME: i686-msvc-1 - MSYS_BITS: 32 RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc SCRIPT: make appveyor-subset-2 + CI_JOB_NAME: i686-msvc-2 # MSVC aux tests - MSYS_BITS: 64 RUST_CHECK_TARGET: check-aux EXCLUDE_CARGO=1 RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + CI_JOB_NAME: x86_64-msvc-aux - MSYS_BITS: 64 SCRIPT: python x.py test src/tools/cargotest src/tools/cargo RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc + CI_JOB_NAME: x86_64-msvc-cargo # MSVC tools tests - MSYS_BITS: 64 SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri + CI_JOB_NAME: x86_64-msvc-tools # 32/64-bit MinGW builds. # @@ -57,18 +63,21 @@ environment: MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z MINGW_DIR: mingw32 + CI_JOB_NAME: i686-mingw-1 - MSYS_BITS: 32 RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu SCRIPT: make appveyor-subset-2 MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z MINGW_DIR: mingw32 + CI_JOB_NAME: i686-mingw-2 - MSYS_BITS: 64 SCRIPT: python x.py test RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu MINGW_URL: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z MINGW_DIR: mingw64 + CI_JOB_NAME: x86_64-mingw # 32/64 bit MSVC and GNU deployment - RUST_CONFIGURE_ARGS: > @@ -77,6 +86,7 @@ environment: --enable-profiler SCRIPT: python x.py dist DEPLOY: 1 + CI_JOB_NAME: dist-x86_64-msvc - RUST_CONFIGURE_ARGS: > --build=i686-pc-windows-msvc --target=i586-pc-windows-msvc @@ -84,6 +94,7 @@ environment: --enable-profiler SCRIPT: python x.py dist DEPLOY: 1 + CI_JOB_NAME: dist-i686-msvc - MSYS_BITS: 32 RUST_CONFIGURE_ARGS: --build=i686-pc-windows-gnu --enable-full-tools SCRIPT: python x.py dist @@ -91,6 +102,7 @@ environment: MINGW_ARCHIVE: i686-6.3.0-release-posix-dwarf-rt_v5-rev2.7z MINGW_DIR: mingw32 DEPLOY: 1 + CI_JOB_NAME: dist-i686-mingw - MSYS_BITS: 64 SCRIPT: python x.py dist RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-gnu --enable-full-tools @@ -98,12 +110,14 @@ environment: MINGW_ARCHIVE: x86_64-6.3.0-release-posix-seh-rt_v5-rev2.7z MINGW_DIR: mingw64 DEPLOY: 1 + CI_JOB_NAME: dist-x86_64-mingw # "alternate" deployment, see .travis.yml for more info - MSYS_BITS: 64 RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler SCRIPT: python x.py dist DEPLOY_ALT: 1 + CI_JOB_NAME: dist-x86_64-msvc-alt matrix: fast_finish: true diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index ea2387b67db..c470ae7eb30 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -130,6 +130,7 @@ exec docker \ --env TRAVIS \ --env TRAVIS_BRANCH \ --env TOOLSTATE_REPO_ACCESS_TOKEN \ + --env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \ --volume "$HOME/.cargo:/cargo" \ --volume "$HOME/rustsrc:$HOME/rustsrc" \ --init \ diff --git a/src/ci/run.sh b/src/ci/run.sh index 44eae0d1800..119b239d6b2 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -11,6 +11,10 @@ set -e +if [ -n "$CI_JOB_NAME" ]; then + echo "[CI_JOB_NAME=$CI_JOB_NAME]" +fi + if [ "$NO_CHANGE_USER" = "" ]; then if [ "$LOCAL_USER_ID" != "" ]; then useradd --shell /bin/bash -u $LOCAL_USER_ID -o -c "" -m user