Skip to content

Commit 6ea4036

Browse files
borsbors
committed
Auto merge of #62247 - pietroalbini:finish-azure-migration, r=Mark-Simulacrum
ci: finish the migration to azure This moves to azure the last builders as we discussed on Discord last night. r? @alexcrichton
2 parents 765eebf + dc9d2b3 commit 6ea4036

File tree

5 files changed

+15
-277
lines changed

5 files changed

+15
-277
lines changed

‎.azure-pipelines/auto.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,8 @@ jobs:
138138
IMAGE: x86_64-gnu-full-bootstrap
139139
x86_64-gnu-aux:
140140
IMAGE: x86_64-gnu-aux
141-
# FIXME: needs reenabling here rather than Travis
142-
# x86_64-gnu-tools:
143-
# IMAGE: x86_64-gnu-tools
141+
x86_64-gnu-tools:
142+
IMAGE: x86_64-gnu-tools
144143
x86_64-gnu-debug:
145144
IMAGE: x86_64-gnu-debug
146145
x86_64-gnu-nopt:
@@ -252,12 +251,10 @@ jobs:
252251
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
253252
VCVARS_BAT: vcvars64.bat
254253
# MSVC tools tests
255-
# FIXME: broken on azure right now, need to figure out a cause and
256-
# reenable
257-
# x86_64-msvc-tools:
258-
# MSYS_BITS: 64
259-
# SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows
260-
# RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri
254+
x86_64-msvc-tools:
255+
MSYS_BITS: 64
256+
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows
257+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri
261258

262259
# 32/64-bit MinGW builds.
263260
#

‎.travis.yml‎

Lines changed: 5 additions & 159 deletions
Original file line numberDiff line numberDiff line change
@@ -1,164 +1,10 @@
11
language: shell
2-
sudo: required
3-
dist: xenial
4-
services:
5-
- docker
6-
addons:
7-
apt:
8-
packages:
9-
- gdb
2+
script: echo Travis CI is not used anymore
103

11-
git:
12-
depth: 2
13-
submodules: false
14-
15-
env:
16-
global:
17-
- CI_JOB_NAME=$TRAVIS_JOB_NAME
18-
19-
matrix:
20-
fast_finish: true
21-
include:
22-
- env: IMAGE=x86_64-gnu-tools
23-
name: x86_64-gnu-tools
24-
if: branch = auto OR (type = pull_request AND commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/)
25-
26-
before_install:
27-
# We'll use the AWS cli to download/upload cached docker layers as well as
28-
# push our deployments, so download that here.
29-
- pip install --user awscli; export PATH=$PATH:$HOME/.local/bin:$HOME/Library/Python/2.7/bin/
30-
- mkdir -p $HOME/rustsrc
31-
# FIXME(#46924): these two commands are required to enable IPv6,
32-
# they shouldn't exist, please revert once more official solutions appeared.
33-
# see https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729
34-
- if [ "$TRAVIS_OS_NAME" = linux ]; then
35-
echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json;
36-
sudo service docker restart;
37-
fi
38-
39-
install:
40-
- case "$TRAVIS_OS_NAME" in
41-
linux)
42-
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 &&
43-
chmod +x $HOME/stamp &&
44-
export PATH=$PATH:$HOME
45-
;;
46-
osx)
47-
if [[ "$SCRIPT" == "./x.py dist" ]]; then
48-
travis_retry brew update &&
49-
travis_retry brew install xz &&
50-
travis_retry brew install swig@3 &&
51-
brew link --force swig@3;
52-
fi &&
53-
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 &&
54-
chmod +x /usr/local/bin/sccache &&
55-
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 &&
56-
chmod +x /usr/local/bin/stamp &&
57-
travis_retry curl -f http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz | tar xJf - &&
58-
export CC=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang &&
59-
export CXX=`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/bin/clang++ &&
60-
export AR=ar
61-
;;
62-
esac
63-
64-
before_script:
65-
- >
66-
echo "#### Disk usage before running script:";
67-
df -h;
68-
du . | sort -nr | head -n100
69-
- >
70-
RUN_SCRIPT="src/ci/init_repo.sh . $HOME/rustsrc";
71-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
72-
export RUN_SCRIPT="$RUN_SCRIPT && src/ci/run.sh";
73-
else
74-
export RUN_SCRIPT="$RUN_SCRIPT && src/ci/docker/run.sh $IMAGE";
75-
# Enable core dump on Linux.
76-
sudo sh -c 'echo "/checkout/obj/cores/core.%p.%E" > /proc/sys/kernel/core_pattern';
77-
fi
78-
- >
79-
if [ "$IMAGE" = mingw-check ]; then
80-
# verify the publish_toolstate script works.
81-
git clone --depth=1 https://github.com/rust-lang-nursery/rust-toolstate.git;
82-
cd rust-toolstate;
83-
python2.7 "$TRAVIS_BUILD_DIR/src/tools/publish_toolstate.py" "$(git rev-parse HEAD)" "$(git log --format=%s -n1 HEAD)" "" "";
84-
cd ..;
85-
rm -rf rust-toolstate;
86-
fi
87-
88-
# Log time information from this machine and an external machine for insight into possible
89-
# clock drift. Timezones don't matter since relative deltas give all the necessary info.
90-
script:
91-
- >
92-
date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
93-
- stamp sh -x -c "$RUN_SCRIPT"
94-
- >
95-
date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
96-
97-
after_success:
98-
- >
99-
echo "#### Build successful; Disk usage after running script:";
100-
df -h;
101-
du . | sort -nr | head -n100
102-
- >
103-
if [ "$DEPLOY$DEPLOY_ALT" == "1" ]; then
104-
mkdir -p deploy/$TRAVIS_COMMIT;
105-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
106-
rm -rf build/dist/doc &&
107-
cp -r build/dist/* deploy/$TRAVIS_COMMIT;
108-
else
109-
rm -rf obj/build/dist/doc &&
110-
cp -r obj/build/dist/* deploy/$TRAVIS_COMMIT;
111-
fi;
112-
ls -la deploy/$TRAVIS_COMMIT;
113-
deploy_dir=rustc-builds;
114-
if [ "$DEPLOY_ALT" == "1" ]; then
115-
deploy_dir=rustc-builds-alt;
116-
fi;
117-
travis_retry aws s3 cp --no-progress --recursive --acl public-read ./deploy s3://rust-lang-ci2/$deploy_dir
118-
fi
119-
120-
after_failure:
121-
- >
122-
echo "#### Build failed; Disk usage after running script:";
123-
df -h;
124-
du . | sort -nr | head -n100
125-
126-
# Random attempt at debugging currently. Just poking around in here to see if
127-
# anything shows up.
128-
129-
# Dump backtrace for macOS
130-
- ls -lat $HOME/Library/Logs/DiagnosticReports/
131-
- find $HOME/Library/Logs/DiagnosticReports
132-
-type f
133-
-name '*.crash'
134-
-not -name '*.stage2-*.crash'
135-
-not -name 'com.apple.CoreSimulator.CoreSimulatorService-*.crash'
136-
-exec printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" {} \;
137-
-exec head -750 {} \;
138-
-exec echo travis_fold":"end:crashlog \; || true
139-
140-
# Dump backtrace for Linux
141-
- ln -s . checkout &&
142-
for CORE in obj/cores/core.*; do
143-
EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|');
144-
if [ -f "$EXE" ]; then
145-
printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE";
146-
gdb --batch -q -c "$CORE" "$EXE"
147-
-iex 'set auto-load off'
148-
-iex 'dir src/'
149-
-iex 'set sysroot .'
150-
-ex bt
151-
-ex q;
152-
echo travis_fold":"end:crashlog;
153-
fi;
154-
done || true
155-
156-
# see #50887
157-
- cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
158-
159-
# attempt to debug anything killed by the oom killer on linux, just to see if
160-
# it happened
161-
- dmesg | grep -i kill
4+
branches:
5+
only:
6+
- auto
7+
- try
1628

1639
notifications:
16410
email: false

‎appveyor.yml‎

Lines changed: 2 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,8 @@
1-
environment:
2-
# This is required for at least an AArch64 compiler in one image, and is also
3-
# going to soon be required for compiling LLVM.
4-
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Preview
5-
6-
# By default schannel checks revocation of certificates unlike some other SSL
7-
# backends, but we've historically had problems on CI where a revocation
8-
# server goes down presumably. See #43333 for more info
9-
CARGO_HTTP_CHECK_REVOKE: false
10-
11-
matrix:
12-
# MSVC tools tests
13-
- CI_JOB_NAME: x86_64-msvc-tools
14-
MSYS_BITS: 64
15-
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows
16-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri
17-
18-
matrix:
19-
fast_finish: true
20-
21-
clone_depth: 2
1+
clone_depth: 1
222
build: false
233

24-
install:
25-
# Print which AppVeyor agent version we're running on.
26-
- appveyor version
27-
# If we need to download a custom MinGW, do so here and set the path
28-
# appropriately.
29-
#
30-
# Note that this *also* means that we're not using what is typically
31-
# /mingw32/bin/python2.7.exe, which is a "correct" python interpreter where
32-
# /usr/bin/python2.7.exe is not. To ensure we use the right interpreter we
33-
# move `C:\Python27` ahead in PATH and then also make sure the `python2.7.exe`
34-
# file exists in there (which it doesn't by default).
35-
- if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/%MINGW_ARCHIVE%
36-
- if defined MINGW_URL 7z x -y %MINGW_ARCHIVE% > nul
37-
- if defined MINGW_URL set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
38-
39-
# If we're compiling for MSVC then we, like most other distribution builders,
40-
# switch to clang as the compiler. This'll allow us eventually to enable LTO
41-
# amongst LLVM and rustc. Note that we only do this on MSVC as I don't think
42-
# clang has an output mode compatible with MinGW that we need. If it does we
43-
# should switch to clang for MinGW as well!
44-
#
45-
# Note that the LLVM installer is an NSIS installer
46-
#
47-
# Original downloaded here came from
48-
# http://releases.llvm.org/8.0.0/LLVM-8.0.0-win64.exe
49-
- 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
50-
- if NOT defined MINGW_URL .\LLVM-8.0.0-win64.exe /S /NCRC /D=C:\clang-rust
51-
- if NOT defined MINGW_URL set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=C:\clang-rust\bin\clang-cl.exe
52-
53-
# Here we do a pretty heinous thing which is to mangle the MinGW installation
54-
# we just had above. Currently, as of this writing, we're using MinGW-w64
55-
# builds of gcc, and that's currently at 6.3.0. We use 6.3.0 as it appears to
56-
# be the first version which contains a fix for #40546, builds randomly
57-
# failing during LLVM due to ar.exe/ranlib.exe failures.
58-
#
59-
# Unfortunately, though, 6.3.0 *also* is the first version of MinGW-w64 builds
60-
# to contain a regression in gdb (#40184). As a result if we were to use the
61-
# gdb provided (7.11.1) then we would fail all debuginfo tests.
62-
#
63-
# In order to fix spurious failures (pretty high priority) we use 6.3.0. To
64-
# avoid disabling gdb tests we download an *old* version of gdb, specifically
65-
# that found inside the 6.2.0 distribution. We then overwrite the 6.3.0 gdb
66-
# with the 6.2.0 gdb to get tests passing.
67-
#
68-
# Note that we don't literally overwrite the gdb.exe binary because it appears
69-
# to just use gdborig.exe, so that's the binary we deal with instead.
70-
- if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/2017-04-20-%MSYS_BITS%bit-gdborig.exe
71-
- if defined MINGW_URL mv 2017-04-20-%MSYS_BITS%bit-gdborig.exe %MINGW_DIR%\bin\gdborig.exe
72-
73-
# Otherwise pull in the MinGW installed on appveyor
74-
- if NOT defined MINGW_URL set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
75-
76-
# Prefer the "native" Python as LLVM has trouble building with MSYS sometimes
77-
- copy C:\Python27\python.exe C:\Python27\python2.7.exe
78-
- set PATH=C:\Python27;%PATH%
79-
80-
# Download and install sccache
81-
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2018-04-26-sccache-x86_64-pc-windows-msvc
82-
- mv 2018-04-26-sccache-x86_64-pc-windows-msvc sccache.exe
83-
- set PATH=%PATH%;%CD%
84-
85-
# Download and install ninja
86-
#
87-
# Note that this is originally from the github releases patch of Ninja
88-
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-03-15-ninja-win.zip
89-
- 7z x 2017-03-15-ninja-win.zip
90-
- set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --enable-ninja
91-
# - set PATH=%PATH%;%CD% -- this already happens above for sccache
92-
93-
# Install InnoSetup to get `iscc` used to produce installers
94-
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-08-22-is.exe
95-
- 2017-08-22-is.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
96-
- set PATH="C:\Program Files (x86)\Inno Setup 5";%PATH%
97-
98-
# Help debug some handle issues on AppVeyor
99-
- appveyor-retry appveyor DownloadFile https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-05-15-Handle.zip
100-
- mkdir handle
101-
- 7z x -ohandle 2017-05-15-Handle.zip
102-
- set PATH=%PATH%;%CD%\handle
103-
- handle.exe -accepteula -help
104-
1054
test_script:
106-
- if not exist C:\cache\rustsrc\NUL mkdir C:\cache\rustsrc
107-
- sh src/ci/init_repo.sh . /c/cache/rustsrc
108-
- set SRC=.
109-
- set NO_CCACHE=1
110-
- sh src/ci/run.sh
5+
- echo AppVeyor is not used anymore
1116

1127
branches:
1138
only:

‎src/tools/miri‎

‎src/tools/rls‎

Submodule rls updated from 597c9be to 124483d

0 commit comments

Comments
 (0)