build(deps): bump envoyproxy/toolshed from actions-v0.3.5 to 0.3.6 (#…

…37323) Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Nov 24, 2024 · 298bac0 · 298bac0
1 parent 1fea935
commit 298bac0
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 104 deletions.
diff --git a/.github/workflows/_check_coverage.yml b/.github/workflows/_check_coverage.yml
@@ -52,11 +52,17 @@ jobs:
       rbe: true
       request: ${{ inputs.request }}
       steps-post: |
-        - run: ci/run_envoy_docker.sh 'ci/do_ci.sh ${{ matrix.target }}-upload'
-          shell: bash
-          env:
-            GCS_ARTIFACT_BUCKET: ${{ inputs.trusted && vars.GCS_ARTIFACT_BUCKET_POST || vars.GCS_ARTIFACT_BUCKET_PRE }}
-            GCS_REDIRECT_PATH: ${{ fromJSON(inputs.request).request.pr || fromJSON(inputs.request).request.target-branch }}
+        - uses: envoyproxy/toolshed/gh-actions/gcs/artefact/[email protected]
+          with:
+            bucket: ${{ inputs.trusted && vars.GCS_ARTIFACT_BUCKET_POST || vars.GCS_ARTIFACT_BUCKET_PRE }}
+            path: generated/${{ matrix.target }}
+            path-upload: ${{ matrix.target }}
+            sha: ${{ fromJSON(inputs.request).request.sha }}
+            redirect: >-
+              ${{ vars.GCS_ARTIFACT_PREFIX
+                  && format('{0}-', vars.GCS_ARTIFACT_PREFIX)
+              }}${{ fromJSON(inputs.request).request.pr
+                    || fromJSON(inputs.request).request.target-branch }}
       target: ${{ matrix.target }}
       timeout-minutes: 180
       trusted: ${{ inputs.trusted }}

diff --git a/.github/workflows/_finish.yml b/.github/workflows/_finish.yml
@@ -36,7 +36,7 @@ jobs:
       actions: read
       contents: read
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       name: Incoming data
       id: needs
       with:
@@ -87,21 +87,21 @@ jobs:
                    summary: "Check has finished",
                    text: $text}}}}
 
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       name: Print summary
       with:
         input: ${{ toJSON(steps.needs.outputs.value).summary-title }}
         filter: |
           "## \(.)"
         options: -Rr
         output-path: GITHUB_STEP_SUMMARY
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       name: Appauth
       id: appauth
       with:
         app_id: ${{ secrets.app-id }}
         key: ${{ secrets.app-key }}
-    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].6
       name: Update check
       with:
         action: update

diff --git a/.github/workflows/_load.yml b/.github/workflows/_load.yml
@@ -100,7 +100,7 @@ jobs:
     # Handle any failure in triggering job
     # Remove any `checks` we dont care about
     # Prepare a check request
-    - uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].6
       name: Load env
       id: data
       with:
@@ -111,21 +111,21 @@ jobs:
         GH_TOKEN: ${{ github.token }}
 
     #  Update the check
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       name: Appauth
       id: appauth
       with:
         app_id: ${{ secrets.app-id }}
         key: ${{ secrets.app-key }}
-    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].6
       name: Update check
       if: ${{ fromJSON(steps.data.outputs.data).data.check.action == 'RUN' }}
       with:
         action: update
         checks: ${{ toJSON(fromJSON(steps.data.outputs.data).checks) }}
         token: ${{ steps.appauth.outputs.token }}
 
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       name: Print request summary
       with:
         input: |
@@ -145,7 +145,7 @@ jobs:
           | $summary.summary as $summary
           | "${{ inputs.template-request-summary }}"
 
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: request-output
       name: Load request
       with:

diff --git a/.github/workflows/_load_env.yml b/.github/workflows/_load_env.yml
@@ -63,18 +63,18 @@ jobs:
       request: ${{ steps.env.outputs.data }}
       trusted: true
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: started
       name: Create timestamp
       with:
         options: -r
         filter: |
           now
-    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].6
       id: checkout
       name: Checkout Envoy repository
     - name: Generate environment variables
-      uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].5
+      uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].6
       id: env
       with:
         branch-name: ${{ inputs.branch-name }}
@@ -86,7 +86,7 @@ jobs:
 
     - name: Request summary
       id: summary
-      uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].5
+      uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].6
       with:
         actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
         base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}

diff --git a/.github/workflows/_precheck_publish.yml b/.github/workflows/_precheck_publish.yml
@@ -83,8 +83,14 @@ jobs:
             --config=docs-ci
           rbe: true
           steps-post: |
-            - run: ci/run_envoy_docker.sh 'ci/do_ci.sh docs-upload'
-              shell: bash
-              env:
-                GCS_ARTIFACT_BUCKET: ${{ inputs.trusted && vars.GCS_ARTIFACT_BUCKET_POST || vars.GCS_ARTIFACT_BUCKET_PRE }}
-                GCS_REDIRECT_PATH: ${{ fromJSON(inputs.request).request.pr || fromJSON(inputs.request).request.target-branch }}
+            - uses: envoyproxy/toolshed/gh-actions/gcs/artefact/[email protected]
+              with:
+                bucket: ${{ inputs.trusted && vars.GCS_ARTIFACT_BUCKET_POST || vars.GCS_ARTIFACT_BUCKET_PRE }}
+                path: generated/docs
+                path-upload: docs
+                sha: ${{ fromJSON(inputs.request).request.sha }}
+                redirect: >-
+                  ${{ vars.GCS_ARTIFACT_PREFIX
+                      && format('{0}-', vars.GCS_ARTIFACT_PREFIX)
+                  }}${{ fromJSON(inputs.request).request.pr
+                        || fromJSON(inputs.request).request.target-branch }}
diff --git a/.github/workflows/_publish_publish.yml b/.github/workflows/_publish_publish.yml
@@ -78,12 +78,12 @@ jobs:
     needs:
     - publish
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: appauth
       with:
         app_id: ${{ secrets.ENVOY_CI_SYNC_APP_ID }}
         key: ${{ secrets.ENVOY_CI_SYNC_APP_KEY }}
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       with:
         ref: main
         repository: ${{ fromJSON(inputs.request).request.version.dev && 'envoyproxy/envoy-website' || 'envoyproxy/archive' }}

diff --git a/.github/workflows/_request.yml b/.github/workflows/_request.yml
@@ -56,14 +56,14 @@ jobs:
       caches: ${{ steps.caches.outputs.value }}
       config: ${{ steps.config.outputs.config }}
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: started
       name: Create timestamp
       with:
         options: -r
         filter: |
           now
-    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].6
       id: checkout
       name: Checkout Envoy repository (requested)
       with:
@@ -77,7 +77,7 @@ jobs:
     # *ALL* variables collected should be treated as untrusted and should be sanitized before
     # use
     - name: Generate environment variables from commit
-      uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].5
+      uses: envoyproxy/toolshed/gh-actions/envoy/ci/[email protected].6
       id: env
       with:
         branch-name: ${{ steps.checkout.outputs.branch-name }}
@@ -88,15 +88,15 @@ jobs:
         vars: ${{ toJSON(vars) }}
         working-directory: requested
 
-    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].6
       id: checkout-target
       name: Checkout Envoy repository (target branch)
       with:
         branch: ${{ fromJSON(steps.env.outputs.data).request.target-branch }}
         config: |
           fetch-depth: 1
           path: target
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: bazel-cache-hash
       name: Bazel cache hash
       with:
@@ -105,7 +105,7 @@ jobs:
 
     - name: Request summary
       id: summary
-      uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].5
+      uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].6
       with:
         actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
         base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}
@@ -121,7 +121,7 @@ jobs:
         target-branch: ${{ fromJSON(steps.env.outputs.data).request.target-branch }}
 
     - name: Environment data
-      uses: envoyproxy/toolshed/gh-actions/[email protected].5
+      uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: data
       with:
         input: |
@@ -164,26 +164,26 @@ jobs:
         path: /tmp/cache
         key: ${{ fromJSON(steps.data.outputs.value).request.build-image.default }}-arm64
 
-    - uses: envoyproxy/toolshed/gh-actions/gcp/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/gcp/[email protected].6
       name: Setup GCP
       with:
         key: ${{ secrets.gcs-cache-key }}
 
-    - uses: envoyproxy/toolshed/gh-actions/gcs/cache/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/gcs/cache/[email protected].6
       name: Check GCS bucket cache (x64)
       id: cache-exists-bazel-x64
       with:
         bucket: ${{ inputs.gcs-cache-bucket }}
         key: ${{ fromJSON(steps.data.outputs.value).config.ci.cache.bazel }}-x64
-    - uses: envoyproxy/toolshed/gh-actions/gcs/cache/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/gcs/cache/[email protected].6
       name: Check GCS bucket cache (arm64)
       id: cache-exists-bazel-arm64
       with:
         bucket: ${{ inputs.gcs-cache-bucket }}
         key: ${{ fromJSON(steps.data.outputs.value).config.ci.cache.bazel }}-arm64
 
     - name: Caches
-      uses: envoyproxy/toolshed/gh-actions/[email protected].5
+      uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: caches
       with:
         input-format: yaml

diff --git a/.github/workflows/_request_cache_bazel.yml b/.github/workflows/_request_cache_bazel.yml
@@ -51,22 +51,22 @@ jobs:
     name: "[${{ inputs.arch }}] Prime Bazel cache"
     if: ${{ ! fromJSON(inputs.caches).bazel[inputs.arch] }}
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].6
       id: checkout-target
       name: Checkout Envoy repository (target branch)
       with:
         branch: ${{ fromJSON(inputs.request).request.target-branch }}
         config: |
           fetch-depth: 1
 
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: appauth
       name: Appauth (mutex lock)
       with:
         app_id: ${{ secrets.app-id }}
         key: ${{ secrets.app-key }}
 
-    - uses: envoyproxy/toolshed/gh-actions/gcp/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/gcp/[email protected].6
       name: Setup GCP
       with:
         key: ${{ secrets.gcs-cache-key }}
@@ -75,7 +75,7 @@ jobs:
         sudo mkdir /build
         sudo chown runner:docker /build
         echo "GITHUB_TOKEN=${{ github.token }}" >> $GITHUB_ENV
-    - uses: envoyproxy/toolshed/gh-actions/cache/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/cache/[email protected].6
       id: bazel-cache
       name: Prime Bazel cache
       with:

diff --git a/.github/workflows/_request_cache_docker.yml b/.github/workflows/_request_cache_docker.yml
@@ -39,7 +39,7 @@ on:
 # For a job that does, you can restore with something like:
 #
 #    steps:
-#    - uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].5
+#    - uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].6
 #      with:
 #        key: "${{ needs.env.outputs.build-image }}"
 #
@@ -51,29 +51,29 @@ jobs:
     name: "[${{ inputs.arch }}] Prime Docker cache"
     if: ${{ ! fromJSON(inputs.caches).docker[inputs.arch] }}
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: appauth
       name: Appauth (mutex lock)
       with:
         app_id: ${{ secrets.app-id }}
         key: ${{ secrets.app-key }}
-    - uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/docker/cache/[email protected].6
       id: docker
       name: Prime Docker cache (${{ inputs.image-tag }}${{ inputs.cache-suffix }})
       with:
         image-tag: ${{ inputs.image-tag }}
         key-suffix: ${{ inputs.cache-suffix }}
         lock-token: ${{ steps.appauth.outputs.token }}
         lock-repository: ${{ inputs.lock-repository }}
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: data
       name: Cache data
       with:
         input-format: yaml
         input: |
           cached: ${{ steps.docker.outputs.cached }}
           key: ${{ inputs.image-tag }}${{ inputs.cache-suffix }}
-    - uses: envoyproxy/toolshed/gh-actions/json/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/json/[email protected].6
       name: Summary
       with:
         json: ${{ steps.data.outputs.value }}

diff --git a/.github/workflows/_request_checks.yml b/.github/workflows/_request_checks.yml
@@ -55,7 +55,7 @@ jobs:
     runs-on: ubuntu-22.04
     name: Start checks
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       id: check-config
       name: Prepare check data
       with:
@@ -78,13 +78,13 @@ jobs:
           | .skipped.output.summary = "${{ inputs.skipped-summary }}"
           | .skipped.output.text = ""
 
-    - uses: envoyproxy/toolshed/gh-actions/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/[email protected].6
       name: Appauth
       id: appauth
       with:
         app_id: ${{ secrets.app-id }}
         key: ${{ secrets.app-key }}
-    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/[email protected].6
       name: Start checks
       id: checks
       with:
@@ -95,7 +95,7 @@ jobs:
 
           ${{ fromJSON(inputs.env).summary.summary }}
         token: ${{ steps.appauth.outputs.token }}
-    - uses: envoyproxy/toolshed/gh-actions/json/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/json/[email protected].6
       name: Summary
       with:
         collapse-open: true
@@ -119,7 +119,7 @@ jobs:
         output-path: GITHUB_STEP_SUMMARY
         title: Checks started/skipped
 
-    - uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].5
+    - uses: envoyproxy/toolshed/gh-actions/github/env/[email protected].6
       name: Save env
       id: data
       with: