mirror of https://github.com/rust-lang/rust.git
travis: Move sccache to the us-west-1 region
Most of the other rust-lang buckets are in us-west-1 and I think the original bucket was just accidentally created in the us-east-1 region. Let's consolidate by moving it to the same location as the rest of our buckets.
This commit is contained in:
parent
5dfc84cfa7
commit
ddd321df91
|
@ -124,7 +124,8 @@ matrix:
|
|||
|
||||
env:
|
||||
global:
|
||||
- SCCACHE_BUCKET=rust-lang-ci-sccache
|
||||
- SCCACHE_BUCKET=rust-lang-ci-sccache2
|
||||
- SCCACHE_REGION=us-west-1
|
||||
- AWS_ACCESS_KEY_ID=AKIAJAMV3QAMMA6AXHFQ
|
||||
# AWS_SECRET_ACCESS_KEY=...
|
||||
- secure: "j96XxTVOSUf4s4r4htIxn/fvIa5DWbMgLqWl7r8z2QfgUwscmkMXAwXuFNc7s7bGTpV/+CgDiMFFM6BAFLGKutytIF6oA02s9b+usQYnM0th7YQ2AIgm9GtMTJCJp4AoyfFmh8F2faUICBZlfVLUJ34udHEe35vOklix+0k4WDo="
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
environment:
|
||||
SCCACHE_BUCKET: rust-lang-ci-sccache
|
||||
SCCACHE_BUCKET: rust-lang-ci-sccache2
|
||||
SCCACHE_REGION: us-west-1
|
||||
AWS_ACCESS_KEY_ID: AKIAJAMV3QAMMA6AXHFQ
|
||||
AWS_SECRET_ACCESS_KEY:
|
||||
secure: 7Y+JiquYedOAgnUU26uL0DPzrxmTtR+qIwG6rNKSuWDffqU3vVZxbGXim9QpTO80
|
||||
|
|
|
@ -57,9 +57,10 @@ mkdir -p $objdir/tmp
|
|||
|
||||
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"
|
||||
args="$args --env SCCACHE_BUCKET"
|
||||
args="$args --env SCCACHE_REGION"
|
||||
args="$args --env AWS_ACCESS_KEY_ID"
|
||||
args="$args --env AWS_SECRET_ACCESS_KEY"
|
||||
args="$args --env SCCACHE_ERROR_LOG=/tmp/sccache/sccache.log"
|
||||
args="$args --volume $objdir/tmp:/tmp/sccache"
|
||||
else
|
||||
|
@ -82,10 +83,10 @@ exec docker \
|
|||
--env SRC=/checkout \
|
||||
$args \
|
||||
--env CARGO_HOME=/cargo \
|
||||
--env DEPLOY=$DEPLOY \
|
||||
--env DEPLOY_ALT=$DEPLOY_ALT \
|
||||
--env DEPLOY \
|
||||
--env DEPLOY_ALT \
|
||||
--env LOCAL_USER_ID=`id -u` \
|
||||
--env TRAVIS=${TRAVIS-false} \
|
||||
--env TRAVIS \
|
||||
--env TRAVIS_BRANCH \
|
||||
--volume "$HOME/.cargo:/cargo" \
|
||||
--volume "$HOME/rustsrc:$HOME/rustsrc" \
|
||||
|
|
Loading…
Reference in New Issue