Skip to content

Commit 5ca2ac2

Browse files
Merge #66
66: Split up Travis into 4 jobs and pin to a specific nightly for SGX r=Goirad a=jack-fortanix This improves parallelism (Travis will run 5 jobs at once) and avoids redundancy (the core_io + nightly builds are being run twice, in the stable and beta builds). Pins the SGX build to 2019-07-11 as with most recently nightly, syntex_syntax fails to compile. Fixing that requires upgrading bindgen (#5) Co-authored-by: Jack Lloyd <[email protected]>
2 parents a342308 + 7a8b3c4 commit 5ca2ac2

File tree

3 files changed

+88
-86
lines changed

3 files changed

+88
-86
lines changed

.travis.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ branches:
77
# Not really necessary, just to get a green badge on “master”
88
- master
99
language: rust
10+
os: linux
1011
dist: xenial
1112
addons:
1213
apt:
@@ -16,20 +17,17 @@ addons:
1617
- clang-3.8
1718
- cmake
1819
rust:
19-
- stable
20-
- beta
21-
matrix:
22-
allow_failures:
23-
- rust: beta
20+
- stable
21+
- beta
22+
- nightly-2019-07-01
23+
- nightly-2019-07-11
2424
env:
2525
global:
2626
- RUST_BACKTRACE=1
2727
# Pinned to this particular nightly version because of core_io. This can be
2828
# re-pinned whenever core_io is updated to the latest nightly.
2929
- CORE_IO_NIGHTLY=nightly-2019-07-01
30+
- SGX_NIGHTLY=nightly-2019-07-11
3031
- LLVM_CONFIG_PATH=llvm-config-3.8
3132
script:
32-
- rustup toolchain add $CORE_IO_NIGHTLY
33-
- rustup toolchain add nightly
34-
- rustup target add --toolchain nightly x86_64-fortanix-unknown-sgx
3533
- ./ct.sh

0 commit comments

Comments
 (0)