Skip to content

Commit ddd321d

Browse files
committed
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.
1 parent 5dfc84c commit ddd321d

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ matrix:
124124

125125
env:
126126
global:
127-
- SCCACHE_BUCKET=rust-lang-ci-sccache
127+
- SCCACHE_BUCKET=rust-lang-ci-sccache2
128+
- SCCACHE_REGION=us-west-1
128129
- AWS_ACCESS_KEY_ID=AKIAJAMV3QAMMA6AXHFQ
129130
# AWS_SECRET_ACCESS_KEY=...
130131
- secure: "j96XxTVOSUf4s4r4htIxn/fvIa5DWbMgLqWl7r8z2QfgUwscmkMXAwXuFNc7s7bGTpV/+CgDiMFFM6BAFLGKutytIF6oA02s9b+usQYnM0th7YQ2AIgm9GtMTJCJp4AoyfFmh8F2faUICBZlfVLUJ34udHEe35vOklix+0k4WDo="

appveyor.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
environment:
2-
SCCACHE_BUCKET: rust-lang-ci-sccache
2+
SCCACHE_BUCKET: rust-lang-ci-sccache2
3+
SCCACHE_REGION: us-west-1
34
AWS_ACCESS_KEY_ID: AKIAJAMV3QAMMA6AXHFQ
45
AWS_SECRET_ACCESS_KEY:
56
secure: 7Y+JiquYedOAgnUU26uL0DPzrxmTtR+qIwG6rNKSuWDffqU3vVZxbGXim9QpTO80

src/ci/docker/run.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ mkdir -p $objdir/tmp
5757

5858
args=
5959
if [ "$SCCACHE_BUCKET" != "" ]; then
60-
args="$args --env SCCACHE_BUCKET=$SCCACHE_BUCKET"
61-
args="$args --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID"
62-
args="$args --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY"
60+
args="$args --env SCCACHE_BUCKET"
61+
args="$args --env SCCACHE_REGION"
62+
args="$args --env AWS_ACCESS_KEY_ID"
63+
args="$args --env AWS_SECRET_ACCESS_KEY"
6364
args="$args --env SCCACHE_ERROR_LOG=/tmp/sccache/sccache.log"
6465
args="$args --volume $objdir/tmp:/tmp/sccache"
6566
else
@@ -82,10 +83,10 @@ exec docker \
8283
--env SRC=/checkout \
8384
$args \
8485
--env CARGO_HOME=/cargo \
85-
--env DEPLOY=$DEPLOY \
86-
--env DEPLOY_ALT=$DEPLOY_ALT \
86+
--env DEPLOY \
87+
--env DEPLOY_ALT \
8788
--env LOCAL_USER_ID=`id -u` \
88-
--env TRAVIS=${TRAVIS-false} \
89+
--env TRAVIS \
8990
--env TRAVIS_BRANCH \
9091
--volume "$HOME/.cargo:/cargo" \
9192
--volume "$HOME/rustsrc:$HOME/rustsrc" \

0 commit comments

Comments
 (0)