Skip to content

Commit 8a0905b

Browse files
committed
Test Rust2018 builds
1 parent 69a64ba commit 8a0905b

File tree

4 files changed

+29
-13
lines changed

4 files changed

+29
-13
lines changed

.travis.yml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,32 +44,26 @@ matrix:
4444
- name: "s390x-unknown-linux-gnu - build-only"
4545
env: TARGET=s390x-unknown-linux-gnu NORUN=1
4646
- name: "i686-apple-darwin"
47-
env: TARGET=i686-apple-darwin
47+
env: TARGET=i686-apple-darwin NO_DOCKER=1
4848
os: osx
4949
osx_image: xcode10
50-
script: ci/run.sh
5150
- name: "x86_64-apple-darwin"
52-
env: TARGET=x86_64-apple-darwin
51+
env: TARGET=x86_64-apple-darwin NO_DOCKER=1
5352
os: osx
5453
osx_image: xcode10
5554
install: true
56-
script: ci/run.sh
5755
- name: "wasm32-unknown-unknown"
5856
env: TARGET=wasm32-unknown-unknown
5957
- name: "nvptx64-nvidia-cuda - cross compiled, build libcore only"
6058
env: TARGET=nvptx64-nvidia-cuda NORUN=1 NOSTD=1
6159
- name: "thumbv6m-none-eabi - build libcore only"
62-
env: TARGET=thumbv6m-none-eabi NORUN=1 NOSTD=1
63-
script: ci/run.sh
60+
env: TARGET=thumbv6m-none-eabi NORUN=1 NOSTD=1 NO_DOCKER=1
6461
- name: "thumbv7m-none-eabi - build libcore only"
65-
env: TARGET=thumbv7m-none-eabi NORUN=1 NOSTD=1
66-
script: ci/run.sh
62+
env: TARGET=thumbv7m-none-eabi NORUN=1 NOSTD=1 NO_DOCKER=1
6763
- name: "thumbv7em-none-eabi - build libcore only"
68-
env: TARGET=thumbv7em-none-eabi NORUN=1 NOSTD=1
69-
script: ci/run.sh
64+
env: TARGET=thumbv7em-none-eabi NORUN=1 NOSTD=1 NO_DOCKER=1
7065
- name: "thumbv7em-none-eabihf - build libcore only"
71-
env: TARGET=thumbv7em-none-eabihf NORUN=1 NOSTD=1
72-
script: ci/run.sh
66+
env: TARGET=thumbv7em-none-eabihf NORUN=1 NOSTD=1 NO_DOCKER=1
7367
- name: "Documentation"
7468
install: true
7569
script: ci/dox.sh
@@ -102,7 +96,23 @@ matrix:
10296
install: travis_retry rustup target add $TARGET
10397
script:
10498
- cargo generate-lockfile
105-
- ci/run-docker.sh $TARGET
99+
- sed 's@2015@2018@g' crates/core_arch/Cargo.toml > crates/core_arch/Cargo2018.toml
100+
- sed 's@2015@2018@g' crates/std_detect/Cargo.toml > crates/std_detect/Cargo2018.toml
101+
- mv crates/core_arch/Cargo.toml crates/core_arch/Cargo.toml.bak
102+
- mv crates/std_detect/Cargo.toml crates/std_detect/Cargo.toml.bak
103+
- mv crates/core_arch/Cargo2018.toml crates/core_arch/Cargo.toml
104+
- mv crates/std_detect/Cargo2018.toml crates/std_detect/Cargo.toml
105+
- cargo build --target="${TARGET}" --manifest-path=crates/core_arch/Cargo.toml
106+
- cargo build --target="${TARGET}" --manifest-path=crates/std_detect/Cargo.toml
107+
- mv crates/core_arch/Cargo.toml.bak crates/core_arch/Cargo.toml
108+
- mv crates/std_detect/Cargo.toml.bak crates/std_detect/Cargo.toml
109+
- |
110+
if [ "${NO_DOCKER}" = "1" ]; then
111+
ci/run.sh $TARGET
112+
else
113+
ci/run-docker.sh $TARGET
114+
fi
115+
106116
107117
notifications:
108118
email:

ci/run.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,7 @@ if [ "$NORUN" != "1" ] && [ "$NOSTD" != 1 ] && [ "$TARGET" != "wasm32-unknown-un
8888
echo test | cargo run --release hex
8989
)
9090
fi
91+
92+
# Test Rust2018 build
93+
cargo build --target="${TARGET}" --manifest-path=crates/core_arch/Cargo2018.toml
94+
cargo build --target="${TARGET}" --manifest-path=crates/std_detect/Cargo2018.toml

crates/core_arch/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ keywords = ["core", "simd", "arch", "intrinsics"]
1515
categories = ["hardware-support", "no-std"]
1616
license = "MIT/Apache-2.0"
1717
build = "build.rs"
18+
edition = "2015"
1819

1920
[badges]
2021
travis-ci = { repository = "rust-lang-nursery/stdsimd" }

crates/std_detect/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ readme = "README.md"
1414
keywords = ["std", "run-time", "feature", "detection"]
1515
categories = ["hardware-support"]
1616
license = "MIT/Apache-2.0"
17+
edition = "2015"
1718

1819
[badges]
1920
travis-ci = { repository = "rust-lang-nursery/stdsimd" }

0 commit comments

Comments
 (0)