Merge branch 'master' into dependabot/bundler/aws-partitions-1.1260.0

Author: pglombardo

.github/workflows/campfire-notify.yml

@@ -1,4 +1,4 @@
-name: Post commit info to Campfire
+name: Campfire Notifications
 
 on:
   push:
@@ -9,10 +9,10 @@ permissions:
 
 jobs:
   post-commit-info:
-    if: secrets.CAMPFIRE_MESSAGES_URL != ''
     runs-on: ubuntu-latest
     steps:
       - name: Post commit info to Campfire
+        if: secrets.CAMPFIRE_MESSAGES_URL != ''
         continue-on-error: true
         uses: shane-lamb/campfire-notify-action@df63cf73810147306276e281bedccf71c1519caf # v1.1.6
         with:

.github/workflows/docker-containers.yml

@@ -1,7 +1,3 @@
----
-# Fork PR builds run only when a maintainer adds the "docker" label. Login and push
-# are disabled for fork PRs; labeled fork PRs still execute untrusted Dockerfiles.
-# Skipped entirely when DOCKER_USERNAME is not configured (e.g. forks).
 name: Docker Container Builds
 
 on:
@@ -31,8 +27,24 @@ permissions:
 env:
   DOCKER_PUSH: true
 jobs:
+  docker-configured:
+    runs-on: ubuntu-latest
+    outputs:
+      enabled: ${{ steps.check.outputs.enabled }}
+    steps:
+      - id: check
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        run: |
+          if [ -n "${DOCKER_USERNAME}" ]; then
+            echo "enabled=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "enabled=false" >> "$GITHUB_OUTPUT"
+          fi
+
   pwpush-container:
-    if: secrets.DOCKER_USERNAME != '' && ((github.event.label && github.event.label.name == 'docker') || github.event_name != 'pull_request')
+    needs: docker-configured
+    if: needs.docker-configured.outputs.enabled == 'true' && ((github.event.label && github.event.label.name == 'docker') || github.event_name != 'pull_request')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -83,7 +95,7 @@ jobs:
             type=gha,mode=max
 
       - name: Post job failure details to Campfire
-        if: failure() && github.ref == 'refs/heads/master'
+        if: failure() && secrets.CAMPFIRE_MESSAGES_URL != '' && github.ref == 'refs/heads/master'
         continue-on-error: true
         uses: shane-lamb/campfire-notify-action@df63cf73810147306276e281bedccf71c1519caf # v1.1.6
         with:
@@ -92,8 +104,8 @@ jobs:
 
 
   public-gateway-container:
-    if: secrets.DOCKER_USERNAME != '' && ((github.event.label && github.event.label.name == 'docker') || github.event_name != 'pull_request')
-    needs: pwpush-container
+    needs: [docker-configured, pwpush-container]
+    if: needs.docker-configured.outputs.enabled == 'true' && ((github.event.label && github.event.label.name == 'docker') || github.event_name != 'pull_request')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -149,16 +161,16 @@ jobs:
             type=gha,mode=max
 
       - name: Post job failure details to Campfire
-        if: failure() && github.ref == 'refs/heads/master'
+        if: failure() && secrets.CAMPFIRE_MESSAGES_URL != '' && github.ref == 'refs/heads/master'
         continue-on-error: true
         uses: shane-lamb/campfire-notify-action@df63cf73810147306276e281bedccf71c1519caf # v1.1.6
         with:
           messages_url: ${{ secrets.CAMPFIRE_MESSAGES_URL }}
           template: job_failed
 
   worker-container:
-    if: secrets.DOCKER_USERNAME != '' && ((github.event.label && github.event.label.name == 'docker') || github.event_name != 'pull_request')
-    needs: pwpush-container
+    needs: [docker-configured, pwpush-container]
+    if: needs.docker-configured.outputs.enabled == 'true' && ((github.event.label && github.event.label.name == 'docker') || github.event_name != 'pull_request')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -214,7 +226,7 @@ jobs:
             type=gha,mode=max
 
       - name: Post job failure details to Campfire
-        if: failure() && github.ref == 'refs/heads/master'
+        if: failure() && secrets.CAMPFIRE_MESSAGES_URL != '' && github.ref == 'refs/heads/master'
         continue-on-error: true
         uses: shane-lamb/campfire-notify-action@df63cf73810147306276e281bedccf71c1519caf # v1.1.6
         with:

.github/workflows/hatchbox-deploy.yml

@@ -1,6 +1,3 @@
----
-# Deploy the OSS demo/production Hatchbox app when a release tag is pushed.
-# Add HATCHBOX_DEPLOY_KEY to repo secrets (App → Repository tab in Hatchbox.io).
 name: Hatchbox Deploy
 
 on:
@@ -13,10 +10,10 @@ permissions:
 
 jobs:
   deploy:
-    if: secrets.HATCHBOX_DEPLOY_KEY != ''
     runs-on: ubuntu-latest
     steps:
       - name: Deploy to Hatchbox
+        if: secrets.HATCHBOX_DEPLOY_KEY != ''
         uses: hatchboxio/github-hatchbox-deploy-action@3bbadafe51e89bbf29fd3932bd84534f4fc9a00c # v2
         with:
           deploy_key: ${{ secrets.HATCHBOX_DEPLOY_KEY }}

.github/workflows/lint-helm.yaml

@@ -1,5 +1,4 @@
----
-name: Lint and Test Charts
+name: Lint and Test Helm Charts
 
 on: pull_request
 
@@ -52,7 +51,7 @@ jobs:
         run: ct install --config ./ct.yaml --target-branch "$TARGET_BRANCH"
 
       - name: Post job failure details to Campfire
-if: failure() && github.base_ref == env.TARGET_BRANCH
+        if: failure() && secrets.CAMPFIRE_MESSAGES_URL != '' && github.base_ref == env.TARGET_BRANCH
         continue-on-error: true
         uses: shane-lamb/campfire-notify-action@df63cf73810147306276e281bedccf71c1519caf # v1.1.6
         with: