From a58906ceb3aedcc12b2c3e808f8f5a14a944d582 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 7 May 2024 12:23:56 +1000 Subject: [PATCH] [CI] Use existing repo variables instead (#23676) --- .github/workflows/ci_build_major_branch.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci_build_major_branch.yml b/.github/workflows/ci_build_major_branch.yml index 2717e7cdcc2..f1c586599a7 100644 --- a/.github/workflows/ci_build_major_branch.yml +++ b/.github/workflows/ci_build_major_branch.yml @@ -72,7 +72,7 @@ jobs: secrets: inherit rollup_tasks: - name: "Housekeeping" + name: "Consolidation" needs: build_targets runs-on: ubuntu-latest @@ -89,11 +89,11 @@ jobs: with: args: --acl public-read --follow-symlinks --delete env: - AWS_S3_BUCKET: qmk-ci + AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }} - AWS_REGION: nyc3 - AWS_S3_ENDPOINT: nyc3.digitaloceanspaces.com + AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }} + AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }} SOURCE_DIR: firmwares DEST_DIR: ${{ inputs.branch || github.ref_name }}/${{ github.sha }} @@ -102,11 +102,11 @@ jobs: with: args: --acl public-read --follow-symlinks --delete env: - AWS_S3_BUCKET: qmk-ci + AWS_S3_BUCKET: ${{ vars.CI_QMK_FM_SPACES_BUCKET }} AWS_ACCESS_KEY_ID: ${{ secrets.CI_QMK_FM_SPACES_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CI_QMK_FM_SPACES_SECRET }} - AWS_REGION: nyc3 - AWS_S3_ENDPOINT: nyc3.digitaloceanspaces.com + AWS_REGION: ${{ vars.CI_QMK_FM_SPACES_REGION }} + AWS_S3_ENDPOINT: ${{ vars.CI_QMK_FM_SPACES_ENDPOINT }} SOURCE_DIR: firmwares DEST_DIR: ${{ inputs.branch || github.ref_name }}/latest