File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -234,8 +234,8 @@ jobs:
234234 fi
235235 exit ${STATUS}
236236 env :
237- AWS_ACCESS_KEY_ID : ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
238- AWS_SECRET_ACCESS_KEY : ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
237+ AWS_ACCESS_KEY_ID : ${{ (github.repository == 'rust-lang/rust' && secrets.CACHES_AWS_ACCESS_KEY_ID) || env.CACHES_AWS_ACCESS_KEY_ID }}
238+ AWS_SECRET_ACCESS_KEY : ${{ (github.repository == 'rust-lang/rust' && secrets.CACHES_AWS_SECRET_ACCESS_KEY) || secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
239239
240240 - name : create github artifacts
241241 run : src/ci/scripts/create-doc-artifacts.sh
@@ -257,8 +257,8 @@ jobs:
257257 - name : upload artifacts to S3
258258 run : src/ci/scripts/upload-artifacts.sh
259259 env :
260- AWS_ACCESS_KEY_ID : ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
261- AWS_SECRET_ACCESS_KEY : ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
260+ AWS_ACCESS_KEY_ID : ${{ (github.repository == 'rust-lang/rust' && secrets.ARTIFACTS_AWS_ACCESS_KEY_ID) || env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
261+ AWS_SECRET_ACCESS_KEY : ${{ (github.repository == 'rust-lang/rust' && secrets.ARTIFACTS_AWS_SECRET_ACCESS_KEY) || secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
262262 # Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
263263 # builders *should* have the AWS credentials available. Still, explicitly
264264 # adding the condition is helpful as this way CI will not silently skip
You can’t perform that action at this time.
0 commit comments