...

fullstaq-ruby · Jul 21, 2024 · 75000cc · 75000cc
1 parent 2bbe4a6
commit 75000cc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 12 deletions.
diff --git a/.github/workflows/ci-cd-main.yml b/.github/workflows/ci-cd-main.yml
@@ -1166,6 +1166,7 @@ jobs:
         with:
           name: rbenv-src
           path: artifacts
+          compression-level: 0
 
 
       - name: Download Docker image artifact [centos-8] from Google Cloud
@@ -1308,6 +1309,7 @@ jobs:
         with:
           name: ruby-src-3.3.4
           path: artifacts
+          compression-level: 0
       - name: Download Ruby source artifact [3.2.4] from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
         env:
@@ -1320,6 +1322,7 @@ jobs:
         with:
           name: ruby-src-3.2.4
           path: artifacts
+          compression-level: 0
       - name: Download Ruby source artifact [3.1.6] from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
         env:
@@ -1332,6 +1335,7 @@ jobs:
         with:
           name: ruby-src-3.1.6
           path: artifacts
+          compression-level: 0
       - name: Download Ruby source artifact [3.0.7] from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
         env:
@@ -1344,6 +1348,7 @@ jobs:
         with:
           name: ruby-src-3.0.7
           path: artifacts
+          compression-level: 0
 
       - name: Download common DEB artifact from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
@@ -1357,6 +1362,7 @@ jobs:
         with:
           name: common-deb
           path: artifacts
+          compression-level: 0
 
       - name: Download common RPM artifact from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
@@ -1370,6 +1376,7 @@ jobs:
         with:
           name: common-rpm
           path: artifacts
+          compression-level: 0
 
       - name: Download Rbenv DEB artifact from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
@@ -1383,6 +1390,7 @@ jobs:
         with:
           name: rbenv-deb
           path: artifacts
+          compression-level: 0
 
       - name: Download Rbenv RPM artifact from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
@@ -1396,6 +1404,7 @@ jobs:
         with:
           name: rbenv-rpm
           path: artifacts
+          compression-level: 0
 
 
       ### Check whether dependent jobs failed ###
@@ -1508,18 +1517,14 @@ jobs:
           BUNDLE_JOBS: 4
 
       - name: Reset build counter
-        run: |
-          base64 -d <<< "$GCLOUD_KEY_DATA" > gcloud-key.json
-          bundle exec ./internal-scripts/ci-cd/update-counter.rb
+        run: bundle exec ./internal-scripts/ci-cd/update-counter.rb
         env:
           BUNDLE_PATH: vendor/bundle
-          BUCKET_NAME: ${{ env.CI_ARTIFACTS_BUCKET }}
+          BUCKET_NAME: ${{ secrets.CI_ARTIFACTS_BUCKET }}
           LOCK_PATH: ${{ env.CI_ARTIFACTS_RUN_NUMBER }}/build-lock
           COUNTER_PATH: ${{ env.CI_ARTIFACTS_RUN_NUMBER }}/build-count
           COUNTER_VALUE: 0
           OPERATION: set
-          GCLOUD_KEY_DATA: ${{ secrets.GCLOUD_KEY }}
-          GCLOUD_KEY: gcloud-key.json
 
       - run: 'false'
 

diff --git a/.github/workflows/ci-cd-main.yml.erb b/.github/workflows/ci-cd-main.yml.erb
@@ -694,6 +694,7 @@ jobs:
         with:
           name: <%= rbenv_source_artifact_name %>
           path: artifacts
+          compression-level: 0
 
       <%- docker_images.each do |image| %>
       <%- unindent(2) do -%>
@@ -728,6 +729,7 @@ jobs:
           with:
             name: <%= ruby_source_artifact_name(ruby_version) %>
             path: artifacts
+            compression-level: 0
       <%- end -%>
       <%- end %>
 
@@ -743,6 +745,7 @@ jobs:
         with:
           name: <%= common_deb_artifact_name %>
           path: artifacts
+          compression-level: 0
 
       - name: Download common RPM artifact from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
@@ -756,6 +759,7 @@ jobs:
         with:
           name: <%= common_rpm_artifact_name %>
           path: artifacts
+          compression-level: 0
 
       - name: Download Rbenv DEB artifact from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
@@ -769,6 +773,7 @@ jobs:
         with:
           name: <%= rbenv_deb_artifact_name %>
           path: artifacts
+          compression-level: 0
 
       - name: Download Rbenv RPM artifact from Google Cloud
         run: ./internal-scripts/ci-cd/download-artifact.sh
@@ -782,6 +787,7 @@ jobs:
         with:
           name: <%= rbenv_rpm_artifact_name %>
           path: artifacts
+          compression-level: 0
 
 
       ### Check whether dependent jobs failed ###
@@ -865,18 +871,14 @@ jobs:
           BUNDLE_JOBS: 4
 
       - name: Reset build counter
-        run: |
-          base64 -d <<< "$GCLOUD_KEY_DATA" > gcloud-key.json
-          bundle exec ./internal-scripts/ci-cd/update-counter.rb
+        run: bundle exec ./internal-scripts/ci-cd/update-counter.rb
         env:
           BUNDLE_PATH: vendor/bundle
-          BUCKET_NAME: ${{ env.CI_ARTIFACTS_BUCKET }}
+          BUCKET_NAME: ${{ secrets.CI_ARTIFACTS_BUCKET }}
           LOCK_PATH: ${{ env.CI_ARTIFACTS_RUN_NUMBER }}/build-lock
           COUNTER_PATH: ${{ env.CI_ARTIFACTS_RUN_NUMBER }}/build-count
           COUNTER_VALUE: 0
           OPERATION: set
-          GCLOUD_KEY_DATA: ${{ secrets.GCLOUD_KEY }}
-          GCLOUD_KEY: gcloud-key.json
 
       - run: 'false'
       <%- distribution_buckets.each_with_index do |distributions, i| %>