From 5b701efac9d2ea998ad818cf0d42e3986ef67c4e Mon Sep 17 00:00:00 2001 From: Adam Daley Date: Sun, 1 Nov 2026 17:37:02 +0000 Subject: [PATCH] Rename R2 vars and derive endpoint from account ID Rename the Cloudflare R2 secret and variable names in the asset publish workflow to use the CLOUDFLARE_R2_* prefix, and point the bucket at CLOUDFLARE_R2_BRANDING_BUCKET. Remove the separate endpoint URL variable and build the R2 endpoint from vars.CLOUDFLARE_ACCOUNT_ID instead. --- .github/workflows/build-and-publish-assets.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-publish-assets.yml b/.github/workflows/build-and-publish-assets.yml index 59b6460..be61cc6 100644 --- a/.github/workflows/build-and-publish-assets.yml +++ b/.github/workflows/build-and-publish-assets.yml @@ -84,20 +84,19 @@ jobs: env: OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }} # Cloudflare R2 - CI/CD (branding GitHub Actions) credentials stored in 1Password. - CF_R2_ACCESS_KEY_ID: op://mkqkefntgcmjlgyxzeaekzuuvq/xddzaoo5rrgl3wg2memaxpcntm/access-key-id - CF_R2_SECRET_ACCESS_KEY: op://mkqkefntgcmjlgyxzeaekzuuvq/xddzaoo5rrgl3wg2memaxpcntm/secret-access-key + CLOUDFLARE_R2_ACCESS_KEY_ID: op://mkqkefntgcmjlgyxzeaekzuuvq/xddzaoo5rrgl3wg2memaxpcntm/access-key-id + CLOUDFLARE_R2_SECRET_ACCESS_KEY: op://mkqkefntgcmjlgyxzeaekzuuvq/xddzaoo5rrgl3wg2memaxpcntm/secret-access-key - name: Publish Assets to Cloudflare R2 if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || (github.event_name == 'workflow_dispatch' && inputs.publish) env: - AWS_ACCESS_KEY_ID: ${{ steps.load-secrets.outputs.CF_R2_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ steps.load-secrets.outputs.CF_R2_SECRET_ACCESS_KEY }} - AWS_S3_ENDPOINT: ${{ vars.CF_R2_ENDPOINT_URL }} - AWS_S3_BUCKET: ${{ vars.CF_R2_DOWNLOAD_BUCKET }} + AWS_ACCESS_KEY_ID: ${{ steps.load-secrets.outputs.CLOUDFLARE_R2_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ steps.load-secrets.outputs.CLOUDFLARE_R2_SECRET_ACCESS_KEY }} + AWS_S3_BUCKET: ${{ vars.CLOUDFLARE_R2_BRANDING_BUCKET }} AWS_DEFAULT_REGION: auto run: | # Configure AWS CLI to use the classic transfer client for S3 operations. aws configure set default.s3.preferred_transfer_client classic aws s3 sync "$RUNNER_TEMP/branding-export/" "s3://$AWS_S3_BUCKET/" \ - --endpoint-url "${AWS_S3_ENDPOINT}" \ + --endpoint-url https://${{ vars.CLOUDFLARE_ACCOUNT_ID }}.r2.cloudflarestorage.com \ --delete --cache-control "public, max-age=300" --no-progress