diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-12-20 11:29:18 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-12-20 12:59:14 -0800 |
| commit | 6b8dda5c7e7fc8fd67c05f67119af7ad2afc1f11 (patch) | |
| tree | 33f7a6d7ef72db88cfa4dbae960ac11ff80f8964 | |
| parent | 7b8cbbe092c776177ea9dcab11b681329875cb08 (diff) | |
| parent | cae98cae4f1045cd30239f2a62a77ab81fa2dec7 (diff) | |
| download | rust-6b8dda5c7e7fc8fd67c05f67119af7ad2afc1f11.tar.gz rust-6b8dda5c7e7fc8fd67c05f67119af7ad2afc1f11.zip | |
Merge branch 'local-sccache' of https://github.com/alexcrichton/rust into rollup
| -rwxr-xr-x | src/ci/docker/run.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index ce8b49a92dc..8c2c8d2a9db 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -28,15 +28,23 @@ docker \ mkdir -p $HOME/.cargo mkdir -p $root_dir/obj +args= +if [ "$SCCACHE_BUCKET" != "" ]; then + args="$args --env SCCACHE_BUCKET=$SCCACHE_BUCKET" + args="$args --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" + args="$args --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" +else + mkdir -p $HOME/.cache/sccache + args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache" +fi + exec docker \ run \ --volume "$root_dir:/checkout:ro" \ --volume "$root_dir/obj:/checkout/obj" \ --workdir /checkout/obj \ --env SRC=/checkout \ - --env SCCACHE_BUCKET=$SCCACHE_BUCKET \ - --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \ - --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \ + $args \ --env CARGO_HOME=/cargo \ --env LOCAL_USER_ID=`id -u` \ --volume "$HOME/.cargo:/cargo" \ |