Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Set up cache build with sccache #1825

Merged
merged 1 commit into from
May 5, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ git:
depth: false
quiet: true

cache:
directories:
- "$HOME/.cargo"
- "$HOME/.cache/sccache"
before_cache:
- rm -rf "$HOME/.cargo/registry"

matrix:
fast_finish: true
include:
Expand Down
37 changes: 23 additions & 14 deletions ci/build-run-docker.sh
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
#!/bin/bash

script_dir=$(cd "$(dirname "$0")" && pwd)
. "$script_dir/shared.sh"
root_dir="${script_dir}/.."

. "${script_dir}/shared.sh"

set -e
# Disable cause it makes shared script not to work properly
#set -x

mkdir -p target
mkdir -p "${HOME}"/.cargo
mkdir -p "${HOME}"/.cache/sccache

DOCKER="$1"
TARGET="$2"
SKIP_TESTS="$3"

travis_fold start "fetch.image.${TARGET}"
travis_time_start
travis_do_cmd sh ci/fetch-rust-docker.sh "$TARGET"
travis_do_cmd sh ci/fetch-rust-docker.sh "${TARGET}"
travis_time_finish
travis_fold end "fetch.image.${TARGET}"

if [ -f "ci/docker/$DOCKER/Dockerfile" ]; then
travis_fold start "build.Dockerfile.${DOCKER}"
travis_time_start
travis_do_cmd docker build -t "$DOCKER" "ci/docker/$DOCKER/"
travis_do_cmd docker build -t "$DOCKER" "ci/docker/${DOCKER}/"
travis_time_finish
travis_fold end "build.Dockerfile.${DOCKER}"
fi
Expand All @@ -31,23 +35,28 @@ fi
docker run \
--entrypoint sh \
--user "$(id -u)":"$(id -g)" \
--volume "$(rustc --print sysroot)":/travis-rust:ro \
--volume "$(pwd)":/src:ro \
--volume "$(pwd)"/target:/src/target \
--workdir /src \
--env TARGET="$TARGET" \
--env SKIP_TESTS="$SKIP_TESTS" \
--env CARGO_HOME=/src/target/cargo-home \
--env CARGO_TARGET_DIR=/src/target \
--volume "$(rustc --print sysroot)":/rustc-sysroot:ro \
--volume "${root_dir}":/checkout:ro \
--volume "${root_dir}"/target:/checkout/target \
--workdir /checkout \
--env TARGET="${TARGET}" \
--env SKIP_TESTS="${SKIP_TESTS}" \
--volume "${HOME}/.cargo:/cargo" \
--env CARGO_HOME=/cargo \
--env CARGO_TARGET_DIR=/checkout/target \
--env LIBZ_SYS_STATIC=1 \
--volume "${HOME}"/.cache/sccache:/sccache \
--env SCCACHE_DIR=/sccache \
--env RUSTC_WRAPPER=sccache \
--tty \
--init \
"$DOCKER" \
-c 'PATH="$PATH":/travis-rust/bin exec sh ci/run.sh'
--rm \
"${DOCKER}" \
-c 'PATH="${PATH}":/rustc-sysroot/bin sh ci/run.sh'

# check that rustup-init was built with ssl support
# see https://github.com/rust-lang/rustup.rs/issues/1051
if ! (nm target/"$TARGET"/release/rustup-init | grep -q Curl_ssl_version); then
if ! (nm target/"${TARGET}"/release/rustup-init | grep -q Curl_ssl_version); then
echo "Missing ssl support!!!!" >&2
exit 1
fi