From 699376ada01dc6223e5365e79ae11c79502fd2ef Mon Sep 17 00:00:00 2001 From: John Erickson Date: Mon, 6 May 2019 11:15:52 -0700 Subject: Add Azure Pipelines --- src/ci/docker/i686-gnu-1/Dockerfile | 22 ++++++++++++++++ src/ci/docker/i686-gnu-2/Dockerfile | 21 +++++++++++++++ src/ci/docker/i686-gnu/Dockerfile | 27 ------------------- src/ci/docker/run.sh | 39 ++++++++++++++++++++++------ src/ci/docker/scripts/sccache.sh | 3 ++- src/ci/docker/x86_64-gnu-tools/checktools.sh | 2 +- 6 files changed, 77 insertions(+), 37 deletions(-) create mode 100644 src/ci/docker/i686-gnu-1/Dockerfile create mode 100644 src/ci/docker/i686-gnu-2/Dockerfile delete mode 100644 src/ci/docker/i686-gnu/Dockerfile (limited to 'src/ci/docker') diff --git a/src/ci/docker/i686-gnu-1/Dockerfile b/src/ci/docker/i686-gnu-1/Dockerfile new file mode 100644 index 00000000000..1a04b8af4c1 --- /dev/null +++ b/src/ci/docker/i686-gnu-1/Dockerfile @@ -0,0 +1,22 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++-multilib \ + make \ + file \ + curl \ + ca-certificates \ + python2.7 \ + git \ + cmake \ + sudo \ + gdb \ + xz-utils + + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu +ENV SCRIPT make ci-subset-1 + diff --git a/src/ci/docker/i686-gnu-2/Dockerfile b/src/ci/docker/i686-gnu-2/Dockerfile new file mode 100644 index 00000000000..b1a0ea6f0e9 --- /dev/null +++ b/src/ci/docker/i686-gnu-2/Dockerfile @@ -0,0 +1,21 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++-multilib \ + make \ + file \ + curl \ + ca-certificates \ + python2.7 \ + git \ + cmake \ + sudo \ + gdb \ + xz-utils + + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu +ENV SCRIPT make ci-subset-2 diff --git a/src/ci/docker/i686-gnu/Dockerfile b/src/ci/docker/i686-gnu/Dockerfile deleted file mode 100644 index 17441ddb454..00000000000 --- a/src/ci/docker/i686-gnu/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++-multilib \ - make \ - file \ - curl \ - ca-certificates \ - python2.7 \ - git \ - cmake \ - sudo \ - gdb \ - xz-utils - - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu -# Exclude some tests that are unlikely to be platform specific, to speed up -# this slow job. -ENV SCRIPT python2.7 ../x.py test \ - --exclude src/bootstrap \ - --exclude src/test/rustdoc-js \ - --exclude src/tools/error_index_generator \ - --exclude src/tools/linkchecker diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 98a765e1cec..cd913e30d11 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +# ignore-tidy-linelength + set -e export MSYS_NO_PATHCONV=1 @@ -40,9 +42,24 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then docker --version >> $hash_key cksum=$(sha512sum $hash_key | \ awk '{print $1}') - s3url="s3://$SCCACHE_BUCKET/docker/$cksum" - url="https://s3-us-west-1.amazonaws.com/$SCCACHE_BUCKET/docker/$cksum" - echo "Attempting to download $s3url" + + if [ "$DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT" != "" ]; then + # install azcopy + echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod/ xenial main" > azure.list + sudo cp ./azure.list /etc/apt/sources.list.d/ + sudo apt-key adv --keyserver packages.microsoft.com --recv-keys EB3E94ADBE1229CF + sudo apt-get update + sudo apt-get install azcopy + + url="https://$DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT.blob.core.windows.net/$DOCKER_LAYER_CACHE_AZURE_STORAGE_CONTAINER/$cksum" + upload="azcopy --quiet --destination $url --dest-key $DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT_KEY" + else + s3url="s3://$SCCACHE_BUCKET/docker/$cksum" + url="https://s3-us-west-1.amazonaws.com/$SCCACHE_BUCKET/docker/$cksum" + upload="aws s3 cp - $s3url" + fi + + echo "Attempting to download $url" rm -f /tmp/rustci_docker_cache set +e retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache "$url" @@ -65,17 +82,17 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then -f "$dockerfile" \ "$context" - if [ "$s3url" != "" ]; then + if [ "$upload" != "" ]; then digest=$(docker inspect rust-ci --format '{{.Id}}') echo "Built container $digest" if ! grep -q "$digest" <(echo "$loaded_images"); then - echo "Uploading finished image to $s3url" + echo "Uploading finished image to $url" set +e docker history -q rust-ci | \ grep -v missing | \ xargs docker save | \ gzip | \ - aws s3 cp - $s3url + $upload set -e else echo "Looks like docker image is the same as before, not uploading" @@ -87,8 +104,8 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then echo "$digest" >>"$info" fi elif [ -f "$docker_dir/disabled/$image/Dockerfile" ]; then - if [ -n "$TRAVIS_OS_NAME" ]; then - echo Cannot run disabled images on travis! + if isCI; then + echo Cannot run disabled images on CI! exit 1 fi # retry messes with the pipe from tar to docker. Not needed on non-travis @@ -117,6 +134,9 @@ if [ "$SCCACHE_BUCKET" != "" ]; then args="$args --env SCCACHE_REGION" args="$args --env AWS_ACCESS_KEY_ID" args="$args --env AWS_SECRET_ACCESS_KEY" +elif [ "$SCCACHE_AZURE_CONNECTION_STRING" != "" ]; then + args="$args --env SCCACHE_AZURE_CONNECTION_STRING" + args="$args --env SCCACHE_AZURE_BLOB_CONTAINER" else mkdir -p $HOME/.cache/sccache args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache" @@ -140,8 +160,11 @@ exec docker \ --env DEPLOY \ --env DEPLOY_ALT \ --env LOCAL_USER_ID=`id -u` \ + --env CI \ --env TRAVIS \ --env TRAVIS_BRANCH \ + --env TF_BUILD \ + --env BUILD_SOURCEBRANCHNAME \ --env TOOLSTATE_REPO_ACCESS_TOKEN \ --env CI_JOB_NAME="${CI_JOB_NAME-$IMAGE}" \ --volume "$HOME/.cargo:/cargo" \ diff --git a/src/ci/docker/scripts/sccache.sh b/src/ci/docker/scripts/sccache.sh index 4c03419894e..d6f2f4fadb2 100644 --- a/src/ci/docker/scripts/sccache.sh +++ b/src/ci/docker/scripts/sccache.sh @@ -1,6 +1,7 @@ set -ex +echo Use sccache built with Azure Storage support 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-unknown-linux-musl + https://rustlangtools.blob.core.windows.net/public/stable-x86_64-unknown-linux-musl.sccache chmod +x /usr/local/bin/sccache diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index af0198705a2..c7e64cd8c3e 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -6,7 +6,7 @@ X_PY="$1" TOOLSTATE_FILE="$(realpath $2)" OS="$3" COMMIT="$(git rev-parse HEAD)" -CHANGED_FILES="$(git diff --name-status HEAD HEAD^)" +CHANGED_FILES="$(git diff --name-status HEAD HEAD^ || echo)" SIX_WEEK_CYCLE="$(( ($(date +%s) / 86400 - 20) % 42 ))" # ^ Number of days after the last promotion of beta. # Its value is 41 on the Tuesday where "Promote master to beta (T-2)" happens. -- cgit 1.4.1-3-g733a5 From 869ddd8d0019683c007956bae17fc07cd30f39f7 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Fri, 10 May 2019 10:17:52 +0200 Subject: ci: still use aws for caches --- .azure-pipelines/auto.fanout.yml | 4 ++-- .azure-pipelines/auto.yml | 5 ----- .azure-pipelines/steps/macos.yml | 10 +++++----- .azure-pipelines/steps/run-script.yml | 6 +++--- .azure-pipelines/steps/windows.yml | 6 +++--- src/ci/docker/run.sh | 23 +++-------------------- src/ci/docker/scripts/sccache.sh | 3 +-- 7 files changed, 17 insertions(+), 40 deletions(-) (limited to 'src/ci/docker') diff --git a/.azure-pipelines/auto.fanout.yml b/.azure-pipelines/auto.fanout.yml index e12836257d9..def19a87076 100644 --- a/.azure-pipelines/auto.fanout.yml +++ b/.azure-pipelines/auto.fanout.yml @@ -160,7 +160,7 @@ jobs: - script: | REM md sccache - REM powershell -Command "iwr -outf sccache\sccache.exe https://rustlangtools.blob.core.windows.net/public/stable-x86_64-pc-windows-msvc.sccache.exe" + REM 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 displayName: Download and install sccache @@ -392,7 +392,7 @@ jobs: mkdir -p $HOME/rustsrc echo "##vso[task.setvariable variable=PATH;]$PATH" - curl -fo /usr/local/bin/sccache https://rustlangtools.blob.core.windows.net/public/stable-x86_64-apple-darwin.sccache + 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 curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin diff --git a/.azure-pipelines/auto.yml b/.azure-pipelines/auto.yml index 5f4c155ce98..189536cff5f 100644 --- a/.azure-pipelines/auto.yml +++ b/.azure-pipelines/auto.yml @@ -1,11 +1,6 @@ # # Azure Pipelines "auto" branch build for Rust on Linux, macOS, and Windows. # -# Notes: -# To get sccache working, I (John Erickson) had to build it with the Azure feature enabled -# and with openssl statically-linked for Linux. -# Here's the build (with a backpointer to source) of where the bits came from: -# https://dev.azure.com/johnterickson/rust-lang/_build/results?buildId=275 pr: none # trigger: diff --git a/.azure-pipelines/steps/macos.yml b/.azure-pipelines/steps/macos.yml index a217df6f308..e88b5613e46 100644 --- a/.azure-pipelines/steps/macos.yml +++ b/.azure-pipelines/steps/macos.yml @@ -3,21 +3,21 @@ steps: - bash: | export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/ - mkdir -p $HOME/rustsrc + mkdir -p $HOME/rustsrc echo "##vso[task.setvariable variable=PATH;]$PATH" - curl -fo /usr/local/bin/sccache https://rustlangtools.blob.core.windows.net/public/stable-x86_64-apple-darwin.sccache + 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 curl -fo /usr/local/bin/stamp https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin chmod +x /usr/local/bin/stamp - + export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang echo "##vso[task.setvariable variable=CC]$CC" - + export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ echo "##vso[task.setvariable variable=CXX]$CXX" - + echo "##vso[task.setvariable variable=AR]ar" displayName: Prep diff --git a/.azure-pipelines/steps/run-script.yml b/.azure-pipelines/steps/run-script.yml index 4ab3e2e06d3..cb8e8a629a7 100644 --- a/.azure-pipelines/steps/run-script.yml +++ b/.azure-pipelines/steps/run-script.yml @@ -5,7 +5,7 @@ steps: date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true) displayName: Log time information (before) -- bash: | +- bash: | which sccache stamp sh -x -c "$RUN_SCRIPT" env: @@ -15,8 +15,8 @@ steps: # Explicitly decrypt secret variables # See https://docs.microsoft.com/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch#secret-variables - SCCACHE_AZURE_CONNECTION_STRING: $(SCCACHE_AZURE_CONNECTION_STRING_SECRET) - DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT_KEY: $(DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT_KEY_SECRET) + AWS_ACCESS_KEY_ID: $(SCCACHE_AWS_ACCESS_KEY_ID) + AWS_SECRET_ACCESS_KEY: $(SCCACHE_AWS_SECRET_ACCESS_KEY) displayName: Run script - bash: | diff --git a/.azure-pipelines/steps/windows.yml b/.azure-pipelines/steps/windows.yml index 5dcba664bee..e3c06d543a9 100644 --- a/.azure-pipelines/steps/windows.yml +++ b/.azure-pipelines/steps/windows.yml @@ -106,7 +106,7 @@ steps: - script: | md sccache - powershell -Command "iwr -outf sccache\sccache.exe https://rustlangtools.blob.core.windows.net/public/stable-x86_64-pc-windows-msvc.sccache.exe" + 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 displayName: Download and install sccache @@ -155,6 +155,6 @@ steps: # explicitly decrypt secret variables # see https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables?view=azure-devops&tabs=yaml%2Cbatch - SCCACHE_AZURE_CONNECTION_STRING: $(SCCACHE_AZURE_CONNECTION_STRING_SECRET) - DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT_KEY: $(DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT_KEY_SECRET) + AWS_ACCESS_KEY_ID: $(SCCACHE_AWS_ACCESS_KEY_ID) + AWS_SECRET_ACCESS_KEY: $(SCCACHE_AWS_SECRET_ACCESS_KEY) displayName: Run script diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index cd913e30d11..0e1485601e9 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -1,7 +1,5 @@ #!/usr/bin/env bash -# ignore-tidy-linelength - set -e export MSYS_NO_PATHCONV=1 @@ -43,21 +41,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then cksum=$(sha512sum $hash_key | \ awk '{print $1}') - if [ "$DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT" != "" ]; then - # install azcopy - echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-xenial-prod/ xenial main" > azure.list - sudo cp ./azure.list /etc/apt/sources.list.d/ - sudo apt-key adv --keyserver packages.microsoft.com --recv-keys EB3E94ADBE1229CF - sudo apt-get update - sudo apt-get install azcopy - - url="https://$DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT.blob.core.windows.net/$DOCKER_LAYER_CACHE_AZURE_STORAGE_CONTAINER/$cksum" - upload="azcopy --quiet --destination $url --dest-key $DOCKER_LAYER_CACHE_AZURE_STORAGE_ACCOUNT_KEY" - else - s3url="s3://$SCCACHE_BUCKET/docker/$cksum" - url="https://s3-us-west-1.amazonaws.com/$SCCACHE_BUCKET/docker/$cksum" - upload="aws s3 cp - $s3url" - fi + s3url="s3://$SCCACHE_BUCKET/docker/$cksum" + url="https://s3-us-west-1.amazonaws.com/$SCCACHE_BUCKET/docker/$cksum" + upload="aws s3 cp - $s3url" echo "Attempting to download $url" rm -f /tmp/rustci_docker_cache @@ -134,9 +120,6 @@ if [ "$SCCACHE_BUCKET" != "" ]; then args="$args --env SCCACHE_REGION" args="$args --env AWS_ACCESS_KEY_ID" args="$args --env AWS_SECRET_ACCESS_KEY" -elif [ "$SCCACHE_AZURE_CONNECTION_STRING" != "" ]; then - args="$args --env SCCACHE_AZURE_CONNECTION_STRING" - args="$args --env SCCACHE_AZURE_BLOB_CONTAINER" else mkdir -p $HOME/.cache/sccache args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache" diff --git a/src/ci/docker/scripts/sccache.sh b/src/ci/docker/scripts/sccache.sh index d6f2f4fadb2..4c03419894e 100644 --- a/src/ci/docker/scripts/sccache.sh +++ b/src/ci/docker/scripts/sccache.sh @@ -1,7 +1,6 @@ set -ex -echo Use sccache built with Azure Storage support curl -fo /usr/local/bin/sccache \ - https://rustlangtools.blob.core.windows.net/public/stable-x86_64-unknown-linux-musl.sccache + https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rust-ci-mirror/2018-04-02-sccache-x86_64-unknown-linux-musl chmod +x /usr/local/bin/sccache -- cgit 1.4.1-3-g733a5 From aab0bb47fa102b57a7e7c35af78c3f0cb79d05eb Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Sun, 12 May 2019 18:00:38 +0200 Subject: ci: merge the i1686-gnu images --- .azure-pipelines/auto.yml | 6 ++---- src/ci/docker/i686-gnu-1/Dockerfile | 22 ---------------------- src/ci/docker/i686-gnu-2/Dockerfile | 21 --------------------- src/ci/docker/i686-gnu/Dockerfile | 27 +++++++++++++++++++++++++++ 4 files changed, 29 insertions(+), 47 deletions(-) delete mode 100644 src/ci/docker/i686-gnu-1/Dockerfile delete mode 100644 src/ci/docker/i686-gnu-2/Dockerfile create mode 100644 src/ci/docker/i686-gnu/Dockerfile (limited to 'src/ci/docker') diff --git a/.azure-pipelines/auto.yml b/.azure-pipelines/auto.yml index facc592422b..e8959e3f17c 100644 --- a/.azure-pipelines/auto.yml +++ b/.azure-pipelines/auto.yml @@ -126,10 +126,8 @@ jobs: asmjs: IMAGE: asmjs - i686-gnu-1: - IMAGE: i686-gnu-1 - i686-gnu-2: - IMAGE: i686-gnu-2 + i686-gnu: + IMAGE: i686-gnu i686-gnu-nopt: IMAGE: i686-gnu-nopt test-various: diff --git a/src/ci/docker/i686-gnu-1/Dockerfile b/src/ci/docker/i686-gnu-1/Dockerfile deleted file mode 100644 index 1a04b8af4c1..00000000000 --- a/src/ci/docker/i686-gnu-1/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++-multilib \ - make \ - file \ - curl \ - ca-certificates \ - python2.7 \ - git \ - cmake \ - sudo \ - gdb \ - xz-utils - - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu -ENV SCRIPT make ci-subset-1 - diff --git a/src/ci/docker/i686-gnu-2/Dockerfile b/src/ci/docker/i686-gnu-2/Dockerfile deleted file mode 100644 index b1a0ea6f0e9..00000000000 --- a/src/ci/docker/i686-gnu-2/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++-multilib \ - make \ - file \ - curl \ - ca-certificates \ - python2.7 \ - git \ - cmake \ - sudo \ - gdb \ - xz-utils - - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu -ENV SCRIPT make ci-subset-2 diff --git a/src/ci/docker/i686-gnu/Dockerfile b/src/ci/docker/i686-gnu/Dockerfile new file mode 100644 index 00000000000..17441ddb454 --- /dev/null +++ b/src/ci/docker/i686-gnu/Dockerfile @@ -0,0 +1,27 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++-multilib \ + make \ + file \ + curl \ + ca-certificates \ + python2.7 \ + git \ + cmake \ + sudo \ + gdb \ + xz-utils + + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu +# Exclude some tests that are unlikely to be platform specific, to speed up +# this slow job. +ENV SCRIPT python2.7 ../x.py test \ + --exclude src/bootstrap \ + --exclude src/test/rustdoc-js \ + --exclude src/tools/error_index_generator \ + --exclude src/tools/linkchecker -- cgit 1.4.1-3-g733a5 From 30b008f5337332e0a1f941113d14f90fa876315e Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Wed, 15 May 2019 19:37:02 +0200 Subject: ci: remove stray echo --- src/ci/docker/x86_64-gnu-tools/checktools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ci/docker') diff --git a/src/ci/docker/x86_64-gnu-tools/checktools.sh b/src/ci/docker/x86_64-gnu-tools/checktools.sh index c7e64cd8c3e..af0198705a2 100755 --- a/src/ci/docker/x86_64-gnu-tools/checktools.sh +++ b/src/ci/docker/x86_64-gnu-tools/checktools.sh @@ -6,7 +6,7 @@ X_PY="$1" TOOLSTATE_FILE="$(realpath $2)" OS="$3" COMMIT="$(git rev-parse HEAD)" -CHANGED_FILES="$(git diff --name-status HEAD HEAD^ || echo)" +CHANGED_FILES="$(git diff --name-status HEAD HEAD^)" SIX_WEEK_CYCLE="$(( ($(date +%s) / 86400 - 20) % 42 ))" # ^ Number of days after the last promotion of beta. # Its value is 41 on the Tuesday where "Promote master to beta (T-2)" happens. -- cgit 1.4.1-3-g733a5 From 8d42b87ac041dc05c9ae8c060aaa8864826639d4 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 May 2019 12:20:50 -0700 Subject: Use new-style s3 urls in docker download script --- src/ci/docker/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ci/docker') diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 0e1485601e9..c9642dbf60c 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -42,7 +42,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then awk '{print $1}') s3url="s3://$SCCACHE_BUCKET/docker/$cksum" - url="https://s3-us-west-1.amazonaws.com/$SCCACHE_BUCKET/docker/$cksum" + url="https://$SCCACHE_BUCKET.s3.amazonaws.com/docker/$cksum" upload="aws s3 cp - $s3url" echo "Attempting to download $url" -- cgit 1.4.1-3-g733a5 From e764f475ca7fffd6167ea991afc7d1b2b3f642dc Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 21 May 2019 15:34:56 -0700 Subject: Disable solaris target since toolchain no longer builds --- src/ci/docker/dist-various-2/Dockerfile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/ci/docker') diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile index 1d6a0269c5b..04db5e9c057 100644 --- a/src/ci/docker/dist-various-2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -32,9 +32,10 @@ COPY dist-various-2/build-cloudabi-toolchain.sh /tmp/ RUN /tmp/build-cloudabi-toolchain.sh x86_64-unknown-cloudabi COPY dist-various-2/build-fuchsia-toolchain.sh /tmp/ RUN /tmp/build-fuchsia-toolchain.sh -COPY dist-various-2/build-solaris-toolchain.sh /tmp/ -RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386 -RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc +# FIXME(#61022) - reenable solaris +# COPY dist-various-2/build-solaris-toolchain.sh /tmp/ +# RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386 +# RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc COPY dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/ # We pass the commit id of the port of LLVM's libunwind to the build script. # Any update to the commit id here, should cause the container image to be re-built from this point on. @@ -73,10 +74,11 @@ ENV CARGO_TARGET_AARCH64_FUCHSIA_RUSTFLAGS \ ENV TARGETS=x86_64-fuchsia ENV TARGETS=$TARGETS,aarch64-fuchsia -ENV TARGETS=$TARGETS,sparcv9-sun-solaris ENV TARGETS=$TARGETS,wasm32-unknown-unknown ENV TARGETS=$TARGETS,wasm32-unknown-wasi -ENV TARGETS=$TARGETS,x86_64-sun-solaris +# FIXME(#61022) - reenable solaris +# ENV TARGETS=$TARGETS,sparcv9-sun-solaris +# ENV TARGETS=$TARGETS,x86_64-sun-solaris ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnux32 ENV TARGETS=$TARGETS,x86_64-unknown-cloudabi ENV TARGETS=$TARGETS,x86_64-fortanix-unknown-sgx -- cgit 1.4.1-3-g733a5