Skip to content

Commit c09cf0f

Browse files
authored
Rollup merge of rust-lang#62142 - alexcrichton:azure-try, r=pietroalbini
ci: Switch official `try` builds to happen on Azure This commit switches the `try` builers to officially happen on Azure Pipelines instead of Travis where they're currently run. This also cuts back the number of builders to just the two we run on Travis, leaving expansion as a possible future extension.
2 parents 00efd13 + f6adc39 commit c09cf0f

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

Diff for: .azure-pipelines/try.yml

+55-55
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
#
2-
# Azure Pipelines "auto" branch build for Rust on Linux, macOS, and Windows.
3-
#
4-
51
pr: none
62
trigger:
73
- try
84

95
variables:
10-
- group: prod-credentials
6+
- group: real-prod-credentials
117

128
jobs:
139
- job: Linux
@@ -26,53 +22,57 @@ jobs:
2622
IMAGE: dist-x86_64-linux
2723
DEPLOY_ALT: 1
2824

29-
- job: macOS
30-
timeoutInMinutes: 600
31-
pool:
32-
vmImage: macos-10.13
33-
steps:
34-
- template: steps/run.yml
35-
strategy:
36-
matrix:
37-
dist-x86_64-apple:
38-
SCRIPT: ./x.py dist
39-
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc
40-
DEPLOY: 1
41-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
42-
MACOSX_DEPLOYMENT_TARGET: 10.7
43-
NO_LLVM_ASSERTIONS: 1
44-
NO_DEBUG_ASSERTIONS: 1
45-
DIST_REQUIRE_ALL_TOOLS: 1
46-
47-
dist-x86_64-apple-alt:
48-
SCRIPT: ./x.py dist
49-
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --enable-lldb --set rust.jemalloc
50-
DEPLOY_ALT: 1
51-
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
52-
MACOSX_DEPLOYMENT_TARGET: 10.7
53-
NO_LLVM_ASSERTIONS: 1
54-
NO_DEBUG_ASSERTIONS: 1
55-
56-
- job: Windows
57-
timeoutInMinutes: 600
58-
pool:
59-
vmImage: 'vs2017-win2016'
60-
steps:
61-
- template: steps/run.yml
62-
strategy:
63-
matrix:
64-
dist-x86_64-msvc:
65-
RUST_CONFIGURE_ARGS: >
66-
--build=x86_64-pc-windows-msvc
67-
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
68-
--enable-full-tools
69-
--enable-profiler
70-
SCRIPT: python x.py dist
71-
DIST_REQUIRE_ALL_TOOLS: 1
72-
DEPLOY: 1
73-
74-
dist-x86_64-msvc-alt:
75-
MSYS_BITS: 64
76-
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
77-
SCRIPT: python x.py dist
78-
DEPLOY_ALT: 1
25+
# The macOS and Windows builds here are currently disabled due to them not being
26+
# overly necessary on `try` builds. We also don't actually have anything that
27+
# consumes the artifacts currently. Perhaps one day we can reenable, but for now
28+
# it helps free up capacity on Azure.
29+
# - job: macOS
30+
# timeoutInMinutes: 600
31+
# pool:
32+
# vmImage: macos-10.13
33+
# steps:
34+
# - template: steps/run.yml
35+
# strategy:
36+
# matrix:
37+
# dist-x86_64-apple:
38+
# SCRIPT: ./x.py dist
39+
# RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc
40+
# DEPLOY: 1
41+
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
42+
# MACOSX_DEPLOYMENT_TARGET: 10.7
43+
# NO_LLVM_ASSERTIONS: 1
44+
# NO_DEBUG_ASSERTIONS: 1
45+
# DIST_REQUIRE_ALL_TOOLS: 1
46+
#
47+
# dist-x86_64-apple-alt:
48+
# SCRIPT: ./x.py dist
49+
# RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --enable-lldb --set rust.jemalloc
50+
# DEPLOY_ALT: 1
51+
# RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
52+
# MACOSX_DEPLOYMENT_TARGET: 10.7
53+
# NO_LLVM_ASSERTIONS: 1
54+
# NO_DEBUG_ASSERTIONS: 1
55+
#
56+
# - job: Windows
57+
# timeoutInMinutes: 600
58+
# pool:
59+
# vmImage: 'vs2017-win2016'
60+
# steps:
61+
# - template: steps/run.yml
62+
# strategy:
63+
# matrix:
64+
# dist-x86_64-msvc:
65+
# RUST_CONFIGURE_ARGS: >
66+
# --build=x86_64-pc-windows-msvc
67+
# --target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
68+
# --enable-full-tools
69+
# --enable-profiler
70+
# SCRIPT: python x.py dist
71+
# DIST_REQUIRE_ALL_TOOLS: 1
72+
# DEPLOY: 1
73+
#
74+
# dist-x86_64-msvc-alt:
75+
# MSYS_BITS: 64
76+
# RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
77+
# SCRIPT: python x.py dist
78+
# DEPLOY_ALT: 1

Diff for: .travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ matrix:
2626

2727
- env: IMAGE=dist-x86_64-linux DEPLOY=1
2828
name: dist-x86_64-linux
29-
if: branch = try OR branch = auto
29+
if: branch = auto
3030

3131
# "alternate" deployments, these are "nightlies" but have LLVM assertions
3232
# turned on, they're deployed to a different location primarily for
3333
# additional testing.
3434
- env: IMAGE=dist-x86_64-linux DEPLOY_ALT=1
3535
name: dist-x86_64-linux-alt
36-
if: branch = try OR branch = auto
36+
if: branch = auto
3737

3838
- env: >
3939
SCRIPT="./x.py dist"

0 commit comments

Comments
 (0)