Auto merge of #62247 - pietroalbini:finish-azure-migration, r=Mark-Simulacrum

bors · bors · commit a4ebb38b7ee5 · 2019-06-30T20:23:08.000Z
ci: finish the migration to azure This moves to azure the last builders as we discussed on Discord last night. r? @alexcrichton
diff --git a/.azure-pipelines/auto.yml b/.azure-pipelines/auto.yml
@@ -138,9 +138,8 @@ jobs:
         IMAGE: x86_64-gnu-full-bootstrap
       x86_64-gnu-aux:
         IMAGE: x86_64-gnu-aux
-        # FIXME: needs reenabling here rather than Travis
-      # x86_64-gnu-tools:
-      #   IMAGE: x86_64-gnu-tools
+      x86_64-gnu-tools:
+        IMAGE: x86_64-gnu-tools
       x86_64-gnu-debug:
         IMAGE: x86_64-gnu-debug
       x86_64-gnu-nopt:
@@ -252,12 +251,10 @@ jobs:
         RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
         VCVARS_BAT: vcvars64.bat
       # MSVC tools tests
-      # FIXME: broken on azure right now, need to figure out a cause and
-      # reenable
-      # x86_64-msvc-tools:
-      #   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
+      x86_64-msvc-tools:
+        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
 
       # 32/64-bit MinGW builds.
       #
diff --git a/.travis.yml b/.travis.yml
@@ -1,164 +1,10 @@
 language: shell
-sudo: required
-dist: xenial
-services:
-  - docker
-addons:
-  apt:
-    packages:
-      - gdb
+script: echo Travis CI is not used anymore
 
-git:
-  depth: 2
-  submodules: false
-
-env:
-  global:
-    - CI_JOB_NAME=$TRAVIS_JOB_NAME
-
-matrix:
-  fast_finish: true
-  include:
-    - env: IMAGE=x86_64-gnu-tools
-      name: x86_64-gnu-tools
-      if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/)
-
-before_install:
-  # We'll use the AWS cli to download/upload cached docker layers as well as
-  # push our deployments, so download that here.
-  - pip install --user awscli; export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/
-  - mkdir -p $HOME/rustsrc
-  # FIXME(#46924): these two commands are required to enable IPv6,
-  # they shouldn't exist, please revert once more official solutions appeared.
-  # see https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729
-  - if [ "$TRAVIS_OS_NAME" = linux ]; then
-      echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json;
-      sudo service docker restart;
-    fi
-
-install:
-  - case "$TRAVIS_OS_NAME" in
-        linux)
-          travis_retry 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
-          ;;
-        osx)
-          if [[ "$SCRIPT" == "./x.py dist" ]]; then
-            travis_retry brew update &&
-            travis_retry brew install xz &&
-            travis_retry brew install swig@3 &&
-            brew link --force swig@3;
-          fi &&
-          travis_retry 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 &&
-          travis_retry 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 &&
-          travis_retry curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - &&
-            export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang &&
-            export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ &&
-            export AR=ar
-          ;;
-    esac
-
-before_script:
-  - >
-      echo "#### Disk usage before running script:";
-      df -h;
-      du . | sort -nr | head -n100
-  - >
-      RUN_SCRIPT="src/ci/init_repo.sh . $HOME/rustsrc";
-      if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-          export RUN_SCRIPT="$RUN_SCRIPT && src/ci/run.sh";
-      else
-          export RUN_SCRIPT="$RUN_SCRIPT && src/ci/docker/run.sh $IMAGE";
-          # Enable core dump on Linux.
-          sudo sh -c 'echo "/checkout/obj/cores/core.%p.%E" > /proc/sys/kernel/core_pattern';
-      fi
-  - >
-      if [ "$IMAGE" = mingw-check ]; then
-        # verify the publish_toolstate script works.
-        git clone --depth=1 https://github.com/rust-lang-nursery/rust-toolstate.git;
-        cd rust-toolstate;
-        python2.7 "$TRAVIS_BUILD_DIR/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "" "";
-        cd ..;
-        rm -rf rust-toolstate;
-      fi
-
-# Log time information from this machine and an external machine for insight into possible
-# clock drift. Timezones don't matter since relative deltas give all the necessary info.
-script:
-  - >
-      date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
-  - stamp sh -x -c "$RUN_SCRIPT"
-  - >
-      date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
-
-after_success:
-  - >
-      echo "#### Build successful; Disk usage after running script:";
-      df -h;
-      du . | sort -nr | head -n100
-  - >
-      if [ "$DEPLOY$DEPLOY_ALT" == "1" ]; then
-        mkdir -p deploy/$TRAVIS_COMMIT;
-        if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-            rm -rf build/dist/doc &&
-            cp -r build/dist/* deploy/$TRAVIS_COMMIT;
-        else
-            rm -rf obj/build/dist/doc &&
-            cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT;
-        fi;
-        ls -la deploy/$TRAVIS_COMMIT;
-        deploy_dir=rustc-builds;
-        if [ "$DEPLOY_ALT" == "1" ]; then
-            deploy_dir=rustc-builds-alt;
-        fi;
-        travis_retry aws s3 cp --no-progress --recursive --acl public-read ./deploy s3://rust-lang-ci2/$deploy_dir
-      fi
-
-after_failure:
-  - >
-      echo "#### Build failed; Disk usage after running script:";
-      df -h;
-      du . | sort -nr | head -n100
-
-  # Random attempt at debugging currently. Just poking around in here to see if
-  # anything shows up.
-
-  # Dump backtrace for macOS
-  - ls -lat $HOME/Library/Logs/DiagnosticReports/
-  - find $HOME/Library/Logs/DiagnosticReports
-      -type f
-      -name '*.crash'
-      -not -name '*.stage2-*.crash'
-      -not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash'
-      -exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \;
-      -exec head -750 {} \;
-      -exec echo travis_fold":"end:crashlog \; || true
-
-  # Dump backtrace for Linux
-  - ln -s . checkout &&
-    for CORE in obj/cores/core.*; do
-      EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|');
-      if [ -f "$EXE" ]; then
-        printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE";
-        gdb --batch -q -c "$CORE" "$EXE"
-          -iex 'set auto-load off'
-          -iex 'dir src/'
-          -iex 'set sysroot .'
-          -ex bt
-          -ex q;
-        echo travis_fold":"end:crashlog;
-      fi;
-    done || true
-
-  # see #50887
-  - cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
-
-  # attempt to debug anything killed by the oom killer on linux, just to see if
-  # it happened
-  - dmesg | grep -i kill
+branches:
+  only:
+    - auto
+    - try
 
 notifications:
   email: false
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,113 +1,8 @@
-environment:
-  # This is required for at least an AArch64 compiler in one image, and is also
-  # going to soon be required for compiling LLVM.
-  APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Preview
-
-  # By default schannel checks revocation of certificates unlike some other SSL
-  # backends, but we've historically had problems on CI where a revocation
-  # server goes down presumably. See #43333 for more info
-  CARGO_HTTP_CHECK_REVOKE: false
-
-  matrix:
-  # MSVC tools tests
-  - CI_JOB_NAME: x86_64-msvc-tools
-    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
-
-matrix:
-  fast_finish: true
-
-clone_depth: 2
+clone_depth: 1
 build: false
 
-install:
-  # Print which AppVeyor agent version we're running on.
-  - appveyor version
-  # If we need to download a custom MinGW, do so here and set the path
-  # appropriately.
-  #
-  # Note that this *also* means that we're not using what is typically
-  # /mingw32/bin/python2.7.exe, which is a "correct" python interpreter where
-  # /usr/bin/python2.7.exe is not. To ensure we use the right interpreter we
-  # move `C:\Python27` ahead in PATH and then also make sure the `python2.7.exe`
-  # file exists in there (which it doesn't by default).
-  - if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/%MINGW_ARCHIVE%
-  - if defined MINGW_URL 7z x -y %MINGW_ARCHIVE% > nul
-  - if defined MINGW_URL set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
-
-  # If we're compiling for MSVC then we, like most other distribution builders,
-  # switch to clang as the compiler. This'll allow us eventually to enable LTO
-  # amongst LLVM and rustc. Note that we only do this on MSVC as I don't think
-  # clang has an output mode compatible with MinGW that we need. If it does we
-  # should switch to clang for MinGW as well!
-  #
-  # Note that the LLVM installer is an NSIS installer
-  #
-  # Original downloaded here came from
-  # http://releases.llvm.org/8.0.0/LLVM-8.0.0-win64.exe
-  - if NOT defined MINGW_URL appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-8.0.0-win64.exe
-  - if NOT defined MINGW_URL .\LLVM-8.0.0-win64.exe /S /NCRC /D=C:\clang-rust
-  - if NOT defined MINGW_URL set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=C:\clang-rust\bin\clang-cl.exe
-
-  # Here we do a pretty heinous thing which is to mangle the MinGW installation
-  # we just had above. Currently, as of this writing, we're using MinGW-w64
-  # builds of gcc, and that's currently at 6.3.0. We use 6.3.0 as it appears to
-  # be the first version which contains a fix for #40546, builds randomly
-  # failing during LLVM due to ar.exe/ranlib.exe failures.
-  #
-  # Unfortunately, though, 6.3.0 *also* is the first version of MinGW-w64 builds
-  # to contain a regression in gdb (#40184). As a result if we were to use the
-  # gdb provided (7.11.1) then we would fail all debuginfo tests.
-  #
-  # In order to fix spurious failures (pretty high priority) we use 6.3.0. To
-  # avoid disabling gdb tests we download an *old* version of gdb, specifically
-  # that found inside the 6.2.0 distribution. We then overwrite the 6.3.0 gdb
-  # with the 6.2.0 gdb to get tests passing.
-  #
-  # Note that we don't literally overwrite the gdb.exe binary because it appears
-  # to just use gdborig.exe, so that's the binary we deal with instead.
-  - if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/2017-04-20-%MSYS_BITS%bit-gdborig.exe
-  - if defined MINGW_URL mv 2017-04-20-%MSYS_BITS%bit-gdborig.exe %MINGW_DIR%\bin\gdborig.exe
-
-  # Otherwise pull in the MinGW installed on appveyor
-  - if NOT defined MINGW_URL set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
-
-  # Prefer the "native" Python as LLVM has trouble building with MSYS sometimes
-  - copy C:\Python27\python.exe C:\Python27\python2.7.exe
-  - set PATH=C:\Python27;%PATH%
-
-  # Download and install sccache
-  - appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc
-  - mv 2018-04-26-sccache-x86_64-pc-windows-msvc sccache.exe
-  - set PATH=%PATH%;%CD%
-
-  # Download and install ninja
-  #
-  # Note that this is originally from the github releases patch of Ninja
-  - appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-03-15-ninja-win.zip
-  - 7z x 2017-03-15-ninja-win.zip
-  - set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja
-  # - set PATH=%PATH%;%CD% -- this already happens above for sccache
-
-  # Install InnoSetup to get `iscc` used to produce installers
-  - appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-08-22-is.exe
-  - 2017-08-22-is.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
-  - set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%
-
-  # Help debug some handle issues on AppVeyor
-  - appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-05-15-Handle.zip
-  - mkdir handle
-  - 7z x -ohandle 2017-05-15-Handle.zip
-  - set PATH=%PATH%;%CD%\handle
-  - handle.exe -accepteula -help
-
 test_script:
-  - if not exist C:\cache\rustsrc\NUL mkdir C:\cache\rustsrc
-  - sh src/ci/init_repo.sh . /c/cache/rustsrc
-  - set SRC=.
-  - set NO_CCACHE=1
-  - sh src/ci/run.sh
+  - echo AppVeyor is not used anymore
 
 branches:
   only:
