diff --git a/.github/workflows/ci-cd-main.yml b/.github/workflows/ci-cd-main.yml index 81b560e2..2e103e17 100644 --- a/.github/workflows/ci-cd-main.yml +++ b/.github/workflows/ci-cd-main.yml @@ -77,7 +77,6 @@ jobs: env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: gcloud config list account check_workflow_uptodate: @@ -118,6 +117,7 @@ jobs: env: ARTIFACT_NAME: rbenv-src ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Extract Rbenv source run: ./internal-scripts/ci-cd/check-version-numbers-need-changing/extract-rbenv-source.sh @@ -822,6 +822,7 @@ jobs: env: ARTIFACT_NAME: docker-image-utility ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -889,6 +890,7 @@ jobs: env: ARTIFACT_NAME: docker-image-utility ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -963,6 +965,7 @@ jobs: env: ARTIFACT_NAME: rbenv-src ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Download utility Docker image run: ./internal-scripts/ci-cd/download-artifact.sh @@ -970,6 +973,7 @@ jobs: env: ARTIFACT_NAME: docker-image-utility ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -1042,6 +1046,7 @@ jobs: env: ARTIFACT_NAME: rbenv-src ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Download utility Docker image run: ./internal-scripts/ci-cd/download-artifact.sh @@ -1049,6 +1054,7 @@ jobs: env: ARTIFACT_NAME: docker-image-utility ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -1129,6 +1135,7 @@ jobs: env: ARTIFACT_NAME: gem-bundle ARTIFACT_PATH: vendor/bundle + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Tar up gem bundle artifact # Because actions/upload-archive is very slow when operating on directories # with many files @@ -1144,6 +1151,7 @@ jobs: env: ARTIFACT_NAME: rbenv-src ARTIFACT_PATH: artifacts + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Rbenv source artifact to Github uses: actions/upload-artifact@v4 with: @@ -1158,6 +1166,7 @@ jobs: ARTIFACT_NAME: 'docker-image-centos-8' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [centos-8] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image centos-8;') @@ -1171,6 +1180,7 @@ jobs: ARTIFACT_NAME: 'docker-image-debian-10' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [debian-10] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image debian-10;') @@ -1184,6 +1194,7 @@ jobs: ARTIFACT_NAME: 'docker-image-debian-11' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [debian-11] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image debian-11;') @@ -1197,6 +1208,7 @@ jobs: ARTIFACT_NAME: 'docker-image-debian-12' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [debian-12] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image debian-12;') @@ -1210,6 +1222,7 @@ jobs: ARTIFACT_NAME: 'docker-image-el-9' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [el-9] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image el-9;') @@ -1223,6 +1236,7 @@ jobs: ARTIFACT_NAME: 'docker-image-ubuntu-20.04' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [ubuntu-20.04] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image ubuntu-20.04;') @@ -1236,6 +1250,7 @@ jobs: ARTIFACT_NAME: 'docker-image-ubuntu-22.04' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [ubuntu-22.04] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image ubuntu-22.04;') @@ -1249,6 +1264,7 @@ jobs: ARTIFACT_NAME: 'docker-image-ubuntu-24.04' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [ubuntu-24.04] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image ubuntu-24.04;') @@ -1262,6 +1278,7 @@ jobs: ARTIFACT_NAME: 'docker-image-utility' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [utility] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image utility;') @@ -1276,6 +1293,7 @@ jobs: ARTIFACT_NAME: ruby-src-3.3.4 ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Ruby source artifact [3.3.4] to Github uses: actions/upload-artifact@v4 with: @@ -1287,6 +1305,7 @@ jobs: ARTIFACT_NAME: ruby-src-3.2.4 ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Ruby source artifact [3.2.4] to Github uses: actions/upload-artifact@v4 with: @@ -1298,6 +1317,7 @@ jobs: ARTIFACT_NAME: ruby-src-3.1.6 ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Ruby source artifact [3.1.6] to Github uses: actions/upload-artifact@v4 with: @@ -1309,6 +1329,7 @@ jobs: ARTIFACT_NAME: ruby-src-3.0.7 ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Ruby source artifact [3.0.7] to Github uses: actions/upload-artifact@v4 with: @@ -1321,6 +1342,7 @@ jobs: ARTIFACT_NAME: common-deb ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive common DEB artifact to Github uses: actions/upload-artifact@v4 with: @@ -1333,6 +1355,7 @@ jobs: ARTIFACT_NAME: common-rpm ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive common RPM artifact to Github uses: actions/upload-artifact@v4 with: @@ -1345,6 +1368,7 @@ jobs: ARTIFACT_NAME: rbenv-deb ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Rbenv DEB artifact to Github uses: actions/upload-artifact@v4 with: @@ -1357,6 +1381,7 @@ jobs: ARTIFACT_NAME: rbenv-rpm ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Rbenv RPM artifact to Github uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/ci-cd-main.yml.erb b/.github/workflows/ci-cd-main.yml.erb index fa34f0d7..a3696199 100644 --- a/.github/workflows/ci-cd-main.yml.erb +++ b/.github/workflows/ci-cd-main.yml.erb @@ -67,7 +67,6 @@ jobs: env: GITHUB_ACTOR: ${{ github.actor }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: gcloud config list account check_workflow_uptodate: @@ -108,6 +107,7 @@ jobs: env: ARTIFACT_NAME: <%= rbenv_source_artifact_name %> ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Extract Rbenv source run: ./internal-scripts/ci-cd/check-version-numbers-need-changing/extract-rbenv-source.sh @@ -357,6 +357,7 @@ jobs: env: ARTIFACT_NAME: <%= docker_image_artifact_name('utility') %> ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -424,6 +425,7 @@ jobs: env: ARTIFACT_NAME: <%= docker_image_artifact_name('utility') %> ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -498,6 +500,7 @@ jobs: env: ARTIFACT_NAME: <%= rbenv_source_artifact_name %> ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Download utility Docker image run: ./internal-scripts/ci-cd/download-artifact.sh @@ -505,6 +508,7 @@ jobs: env: ARTIFACT_NAME: <%= docker_image_artifact_name('utility') %> ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -577,6 +581,7 @@ jobs: env: ARTIFACT_NAME: <%= rbenv_source_artifact_name %> ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Download utility Docker image run: ./internal-scripts/ci-cd/download-artifact.sh @@ -584,6 +589,7 @@ jobs: env: ARTIFACT_NAME: <%= docker_image_artifact_name('utility') %> ARTIFACT_PATH: . + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Load utility Docker image run: ./internal-scripts/ci-cd/load-docker-image.sh if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Use locally-built Docker image utility;') @@ -657,6 +663,7 @@ jobs: env: ARTIFACT_NAME: gem-bundle ARTIFACT_PATH: vendor/bundle + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Tar up gem bundle artifact # Because actions/upload-archive is very slow when operating on directories # with many files @@ -672,6 +679,7 @@ jobs: env: ARTIFACT_NAME: <%= rbenv_source_artifact_name %> ARTIFACT_PATH: artifacts + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Rbenv source artifact to Github uses: actions/upload-artifact@v4 with: @@ -687,6 +695,7 @@ jobs: ARTIFACT_NAME: '<%= docker_image_artifact_name(image[:id]) %>' ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Docker image artifact [<%= image[:id] %>] to Github uses: actions/upload-artifact@v4 if: contains(needs.determine_necessary_jobs.outputs.necessary_jobs, ';Build Docker image <%= image[:id] %>;') @@ -704,6 +713,7 @@ jobs: ARTIFACT_NAME: <%= ruby_source_artifact_name(ruby_version) %> ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Ruby source artifact [<%= ruby_version %>] to Github uses: actions/upload-artifact@v4 with: @@ -718,6 +728,7 @@ jobs: ARTIFACT_NAME: <%= common_deb_artifact_name %> ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive common DEB artifact to Github uses: actions/upload-artifact@v4 with: @@ -730,6 +741,7 @@ jobs: ARTIFACT_NAME: <%= common_rpm_artifact_name %> ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive common RPM artifact to Github uses: actions/upload-artifact@v4 with: @@ -742,6 +754,7 @@ jobs: ARTIFACT_NAME: <%= rbenv_deb_artifact_name %> ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Rbenv DEB artifact to Github uses: actions/upload-artifact@v4 with: @@ -754,6 +767,7 @@ jobs: ARTIFACT_NAME: <%= rbenv_rpm_artifact_name %> ARTIFACT_PATH: artifacts CLEAR: true + CI_ARTIFACTS_BUCKET: ${{ vars.CI_ARTIFACTS_BUCKET }} - name: Archive Rbenv RPM artifact to Github uses: actions/upload-artifact@v4 with: