Skip to content

Commit b30694b

Browse files
committed
Auto merge of #4113 - alexcrichton:trim-travis, r=alexcrichton
Remove lots of dated configuration from this repo Lots of data build stuff is still here from awhile ago when this repo was producing Cargo binaries, but the rust-lang/rust repo is now responsible for all these binaries and build configurations. We no longer need to produce artifacts or have tons of cross-compiles as rust-lang/rust does all that work, instead let's just test the likely-to-regress platforms and have rust-lang/rust take care of the rest. This commit: * Deletes the old `configure` script and `Makefile` * Rewrites `src/doc` management as a shell script * Trims down Travis/AppVeyor configuration
2 parents 82733b0 + 50a46f4 commit b30694b

File tree

14 files changed

+50
-1228
lines changed

14 files changed

+50
-1228
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

.travis.yml

Lines changed: 18 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -2,161 +2,53 @@ language: rust
22
rust: stable
33
sudo: required
44
dist: trusty
5-
os: linux
6-
services:
7-
- docker
85

96
git:
107
depth: 1
118

129
matrix:
1310
include:
14-
# stable linux builds, tested
1511
- env: TARGET=x86_64-unknown-linux-gnu
1612
ALT=i686-unknown-linux-gnu
17-
IMAGE=dist
18-
MAKE_TARGETS="test distcheck doc install uninstall"
19-
ALLOW_PR=1
20-
NO_ADD=1
21-
- env: TARGET=i686-unknown-linux-gnu
22-
IMAGE=dist
23-
MAKE_TARGETS=test-unit-i686-unknown-linux-gnu
24-
CFG_DISABLE_CROSS_TESTS=1
25-
26-
# stable osx builds, tested
2713
- env: TARGET=x86_64-apple-darwin
2814
ALT=i686-apple-darwin
29-
MAKE_TARGETS="test distcheck doc install uninstall"
30-
MACOSX_DEPLOYMENT_TARGET=10.7
31-
NO_ADD=1
32-
os: osx
33-
- env: TARGET=i686-apple-darwin
34-
MAKE_TARGETS=test-unit-i686-apple-darwin
35-
MACOSX_DEPLOYMENT_TARGET=10.7
36-
CFG_DISABLE_CROSS_TESTS=1
3715
os: osx
3816

39-
# stable musl target, tested
40-
- env: TARGET=x86_64-unknown-linux-musl
41-
IMAGE=x86_64-musl
42-
CFG_DISABLE_CROSS_TESTS=1
43-
MAKE_TARGETS=test-unit-$TARGET
44-
45-
# cross compiled targets
46-
- env: TARGET=armv7-linux-androideabi
47-
IMAGE=android
48-
- env: TARGET=arm-unknown-linux-gnueabi
49-
IMAGE=cross
50-
- env: TARGET=arm-unknown-linux-gnueabihf
51-
IMAGE=cross
52-
- env: TARGET=armv7-unknown-linux-gnueabihf
53-
IMAGE=cross
54-
- env: TARGET=aarch64-unknown-linux-gnu
55-
IMAGE=cross
56-
- env: TARGET=i686-unknown-freebsd
57-
IMAGE=cross
58-
- env: TARGET=x86_64-unknown-freebsd
59-
IMAGE=cross
60-
- env: TARGET=x86_64-unknown-netbsd
61-
IMAGE=cross
62-
- env: TARGET=mips-unknown-linux-gnu
63-
IMAGE=cross
64-
- env: TARGET=mipsel-unknown-linux-gnu
65-
IMAGE=cross
66-
- env: TARGET=mips64-unknown-linux-gnuabi64
67-
IMAGE=cross
68-
rust: beta
69-
- env: TARGET=mips64el-unknown-linux-gnuabi64
70-
IMAGE=cross
71-
rust: beta
72-
- env: TARGET=s390x-unknown-linux-gnu
73-
IMAGE=cross
74-
rust: beta
75-
- env: TARGET=powerpc-unknown-linux-gnu
76-
IMAGE=cross
77-
rust: beta
78-
- env: TARGET=powerpc64-unknown-linux-gnu
79-
IMAGE=cross
80-
rust: beta
81-
- env: TARGET=powerpc64le-unknown-linux-gnu
82-
IMAGE=cross
83-
rust: beta
84-
85-
# beta/nightly builds
8617
- env: TARGET=x86_64-unknown-linux-gnu
8718
ALT=i686-unknown-linux-gnu
88-
IMAGE=dist
89-
MAKE_TARGETS="test distcheck doc install uninstall"
90-
DEPLOY=0
91-
NO_ADD=1
9219
rust: beta
20+
9321
- env: TARGET=x86_64-unknown-linux-gnu
9422
ALT=i686-unknown-linux-gnu
95-
IMAGE=dist
96-
MAKE_TARGETS="test distcheck doc install uninstall"
97-
DEPLOY=0
98-
NO_ADD=1
9923
rust: nightly
24+
script:
25+
- cargo test
26+
- cargo doc --no-deps
27+
- sh src/ci/dox.sh
28+
after_success: |
29+
[ $TRAVIS_BRANCH = master ] &&
30+
[ $TRAVIS_PULL_REQUEST = false ] &&
31+
[ $(uname -s) = Linux ] &&
32+
pip install ghp-import --user &&
33+
$HOME/.local/bin/ghp-import -n target/doc &&
34+
git push -qf https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages 2>&1 > /dev/null
10035
10136
exclude:
10237
- rust: stable
10338

10439
before_script:
105-
- if [ -z "$NO_ADD" ]; then rustup target add $TARGET; fi
106-
- if [ ! -z "$ALT" ]; then rustup target add $ALT; fi
40+
- rustup target add $ALT
10741
script:
108-
- >
109-
if [ "$ALLOW_PR" = "" ] && [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
110-
echo skipping, not a full build;
111-
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
112-
SRC=. src/ci/run.sh $TARGET;
113-
else
114-
src/ci/docker/run.sh $IMAGE $TARGET;
115-
fi
116-
117-
after_success: |
118-
[ $TRAVIS_BRANCH = master ] &&
119-
[ $TRAVIS_PULL_REQUEST = false ] &&
120-
[ $(uname -s) = Linux ] &&
121-
pip install ghp-import --user &&
122-
$HOME/.local/bin/ghp-import -n target/doc &&
123-
git push -qf https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages 2>&1 > /dev/null
42+
- cargo test
12443

12544
env:
12645
global:
127-
- DEPLOY=1
12846
- secure: "hWheSLilMM4DXChfSy2XsDlLw338X2o+fw8bE590xxU2TzngFW8GUfq7lGfZEp/l4SNNIS6ROU/igyttCZtxZMANZ4aMQZR5E8Fp4yPOyE1pZLDH/LdQVXnROsfburQJeq+GIYIbZ01Abzh5ClpgLg5KX0H627uj063zZ7Ljo/w="
12947

13048
notifications:
13149
email:
13250
on_success: never
133-
134-
before_deploy:
135-
- mkdir -p deploy/$TRAVIS_COMMIT
136-
- cp target/$TARGET/release/dist/cargo-*-$TARGET.tar.gz
137-
deploy/$TRAVIS_COMMIT
138-
- >
139-
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
140-
find "deploy/$TRAVIS_COMMIT" -maxdepth 1 -type f -exec sh -c 'shasum -a 256 -b "{}" > "{}.sha256"' \;;
141-
else
142-
find "deploy/$TRAVIS_COMMIT" -maxdepth 1 -type f -exec sh -c 'sha256sum -b "{}" > "{}.sha256"' \;;
143-
fi
144-
145-
deploy:
146-
- provider: s3
147-
bucket: rust-lang-ci
148-
skip_cleanup: true
149-
local_dir: deploy
150-
upload_dir: cargo-builds
151-
acl: public_read
152-
region: us-east-1
153-
access_key_id: AKIAIWZDM2B2IJOWBGTA
154-
secret_access_key:
155-
secure: NB9b/MhIDiv8OtNiN/sHaFgA3xG2fa7MGuQQKJNj80ktvgByzDm5UPNyNeoYx9SmJ3jOWobgcPVaoUd2S+6XgO3bMBqm7sM/oMeE0KdqToh6+V2bKfyRF2U5fm697LEGepPIBYqMLDg4nr/dbknbKltzp6dAfJRyy22Nb721zPQ=
156-
on:
157-
branch: auto-cargo
158-
condition: $DEPLOY = 1
159-
160-
cache:
161-
directories:
162-
- target/openssl
51+
addons:
52+
apt:
53+
packages:
54+
- gcc-multilib

0 commit comments

Comments
 (0)