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 @@ -225,8 +225,8 @@ jobs:
225225 fi
226226 exit ${STATUS}
227227 env :
228- AWS_ACCESS_KEY_ID : ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
229- AWS_SECRET_ACCESS_KEY : ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}
228+ AWS_ACCESS_KEY_ID : ${{ (github.repository == 'rust-lang/rust' && secrets.CACHES_AWS_ACCESS_KEY_ID) || env.CACHES_AWS_ACCESS_KEY_ID }}
229+ 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)] }}
230230
231231 - name : create github artifacts
232232 run : src/ci/scripts/create-doc-artifacts.sh
@@ -248,8 +248,8 @@ jobs:
248248 - name : upload artifacts to S3
249249 run : src/ci/scripts/upload-artifacts.sh
250250 env :
251- AWS_ACCESS_KEY_ID : ${{ env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
252- AWS_SECRET_ACCESS_KEY : ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.ARTIFACTS_AWS_ACCESS_KEY_ID)] }}
251+ AWS_ACCESS_KEY_ID : ${{ (github.repository == 'rust-lang/rust' && secrets.ARTIFACTS_AWS_ACCESS_KEY_ID) || env.ARTIFACTS_AWS_ACCESS_KEY_ID }}
252+ 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)] }}
253253 # Adding a condition on DEPLOY=1 or DEPLOY_ALT=1 is not needed as all deploy
254254 # builders *should* have the AWS credentials available. Still, explicitly
255255 # 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