Skip to content

Commit 7891ccc

Browse files
committed
Switch from repo secrets to vars
- cleanup
1 parent feadf1a commit 7891ccc

2 files changed

Lines changed: 20 additions & 28 deletions

File tree

.github/workflows/release-build-sign-upload.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353

5454
outputs:
55-
aws-s3-bucket: "v${{ steps.parse-semver.outputs.version-major }}-cf-cli-releases"
55+
aws-s3-bucket: "v${{ steps.parse-semver.outputs.version-major }}-cf-cli-releases"
5656

5757
version-build: ${{ steps.parse-semver.outputs.version-build }}
5858
version-major: ${{ steps.parse-semver.outputs.version-major }}
@@ -730,8 +730,8 @@ jobs:
730730
actions: read
731731
contents: read
732732
env:
733-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
734-
AWS_REGION: ${{ secrets.AWS_REGION }}
733+
AWS_ACCESS_KEY_ID: ${{ vars.AWS_ACCESS_KEY_ID }}
734+
AWS_REGION: ${{ vars.AWS_REGION }}
735735
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
736736
AWS_S3_BUCKET: ${{ needs.setup.outputs.aws-s3-bucket }}
737737
VERSION_BUILD: ${{ needs.setup.outputs.version-build }}
@@ -836,17 +836,13 @@ jobs:
836836

837837
- name: Setup aws to upload installers to CLAW S3 bucket
838838
uses: aws-actions/configure-aws-credentials@v4
839-
env:
840-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
841-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
842-
AWS_S3_ROLE_ARN: ${{ secrets.AWS_S3_ROLE_ARN }}
843839
with:
844-
aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
845-
aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
846-
aws-region: us-west-1
847-
role-to-assume: ${{ env.AWS_S3_ROLE_ARN }}
840+
aws-access-key-id: ${{ vars.AWS_ACCESS_KEY_ID }}
841+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
842+
aws-region: ${{ vars.AWS_REGION }}
843+
role-to-assume: ${{ vars.AWS_S3_ROLE_ARN }}
848844
role-skip-session-tagging: true
849-
role-duration-seconds: 1200
845+
role-duration-seconds: 1200
850846

851847
- name: Upload installers to CLAW S3 bucket
852848
run: aws s3 sync upload "s3://v${VERSION_MAJOR}-cf-cli-releases/releases/v${VERSION_BUILD}/"

.github/workflows/release-update-repos.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -290,13 +290,13 @@ jobs:
290290
291291
- name: Update Debian Repository
292292
env:
293-
DEBIAN_FRONTEND: noninteractive
294-
SIGNING_KEY_GPG_ID: ${{ secrets.SIGNING_KEY_GPG_ID }}
295-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
296-
AWS_BUCKET_NAME: cf-cli-debian-repo
297-
AWS_DEFAULT_REGION: us-west-2
293+
DEBIAN_FRONTEND: noninteractive
294+
SIGNING_KEY_GPG_ID: ${{ secrets.SIGNING_KEY_GPG_ID }}
295+
AWS_ACCESS_KEY_ID: ${{ vars.AWS_ACCESS_KEY_ID }}
296+
AWS_BUCKET_NAME: cf-cli-debian-repo
297+
AWS_DEFAULT_REGION: us-west-2
298298
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
299-
AWS_S3_ROLE_ARN: ${{ secrets.AWS_S3_ROLE_ARN }}
299+
AWS_S3_ROLE_ARN: ${{ vars.AWS_S3_ROLE_ARN }}
300300
run: |
301301
export $(printf "AWS_ACCESS_KEY_ID=%s AWS_SECRET_ACCESS_KEY=%s AWS_SESSION_TOKEN=%s" $(aws sts assume-role --role-arn ${AWS_S3_ROLE_ARN} --role-session-name foobar --output text --query "Credentials.[AccessKeyId,SecretAccessKey,SessionToken]"))
302302
deb-s3 upload installers/*.deb \
@@ -359,7 +359,7 @@ jobs:
359359
# TODO: fix backup
360360
# - name: Download current RPM repodata
361361
# env:
362-
# AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
362+
# AWS_ACCESS_KEY_ID: ${{ vars.AWS_ACCESS_KEY_ID }}
363363
# AWS_DEFAULT_REGION: us-east-1
364364
# AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
365365
# uses: docker://amazon/aws-cli:latest
@@ -393,17 +393,13 @@ jobs:
393393
394394
- name: Setup aws to upload installers to CLAW S3 bucket
395395
uses: aws-actions/configure-aws-credentials@v4
396-
env:
397-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
398-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
399-
AWS_S3_ROLE_ARN: ${{ secrets.AWS_S3_ROLE_ARN }}
400396
with:
401-
aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
402-
aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
403-
aws-region: us-west-1
404-
role-to-assume: ${{ env.AWS_S3_ROLE_ARN }}
397+
aws-access-key-id: ${{ vars.AWS_ACCESS_KEY_ID }}
398+
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
399+
aws-region: ${{ vars.AWS_REGION }}
400+
role-to-assume: ${{ vars.AWS_S3_ROLE_ARN }}
405401
role-skip-session-tagging: true
406-
role-duration-seconds: 1200
402+
role-duration-seconds: 1200
407403

408404
- name: Download V8 RPMs
409405
run: aws s3 sync --exclude "*" --include "releases/*/*installer*.rpm" s3://v8-cf-cli-releases .

0 commit comments

Comments
 (0)