diff options
| author | bors <bors@rust-lang.org> | 2019-08-13 06:25:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-13 06:25:52 +0000 |
| commit | eae3437dfe991621e8afdc82734f4a172d7ddf9b (patch) | |
| tree | 8936a353a9fe2195322baf40de256354626bbbcc /src/ci | |
| parent | 3f55461efb25b3c8b5c5c3d829065cb032ec953b (diff) | |
| parent | c9be294d11352614f6f0eaa7161df325b9300de2 (diff) | |
| download | rust-1.37.0.tar.gz rust-1.37.0.zip | |
Auto merge of #63498 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.37.0
1.37.0 stable This promotes beta to stable and backports a few PRs: - Avoid ICE when referencing desugared local binding in borrow error (#63051) - Don't access a static just for its size and alignment (#62982) via 331e09b143aebfcf82dc1f9b69b31ee0083cbf0b
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/azure-pipelines/steps/run.yml | 9 | ||||
| -rwxr-xr-x | src/ci/run.sh | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ci/azure-pipelines/steps/run.yml b/src/ci/azure-pipelines/steps/run.yml index 18385f078bf..ab990575f93 100644 --- a/src/ci/azure-pipelines/steps/run.yml +++ b/src/ci/azure-pipelines/steps/run.yml @@ -30,6 +30,10 @@ steps: - bash: printenv | sort displayName: Show environment variables +# Log the date, even on failure. Attempting to debug SSL certificate errors. +- bash: date + displayName: Print out date (before build) + - bash: | set -e df -h @@ -198,3 +202,8 @@ steps: condition: variables['AWS_SECRET_ACCESS_KEY'] continueOnError: true displayName: Upload CPU usage statistics + +# Log the date, even on failure. Attempting to debug SSL certificate errors. +- bash: date + continueOnError: true + displayName: Print out date (after build) diff --git a/src/ci/run.sh b/src/ci/run.sh index e5e0e6cf603..f19bd4e7ec7 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -45,7 +45,7 @@ fi # # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable` # either automatically or manually. -export RUST_RELEASE_CHANNEL=beta +export RUST_RELEASE_CHANNEL=stable if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=$RUST_RELEASE_CHANNEL" RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp" |