Merge branch 'master' into 15660-devhub-version-rollback

Author: eviljeff

.github/workflows/_health_check.yml

@@ -17,6 +17,10 @@ on:
         description: Whether to notify the user of the health check outcome
         type: boolean
         required: false
+      slack_channel:
+        description: The Slack channel to send notifications to
+        type: string
+        required: false
     secrets:
       SLACK_TOKEN:
         description: The Slack token to use for notifications
@@ -37,6 +41,10 @@ on:
         description: Whether to notify the user of the health check outcome
         type: boolean
         required: false
+      slack_channel:
+        description: The Slack channel to send notifications to
+        type: string
+        required: false
 
 env:
   health_check_file: health_check.json
@@ -46,6 +54,7 @@ jobs:
   context:
     runs-on: ubuntu-latest
     outputs:
+      slack_channel: ${{ steps.environment.outputs.slack_channel }}
       notify: ${{ steps.environment.outputs.notify }}
       environment: ${{ steps.environment.outputs.environment }}
 
@@ -55,6 +64,7 @@ jobs:
         env:
           notify: ${{ inputs.notify }}
           environment: ${{ inputs.environment }}
+          slack_channel: ${{ inputs.slack_channel }}
         run: |
           if [[ "$environment" == "prod" ]]; then
             environment="prod"
@@ -66,8 +76,11 @@ jobs:
             environment="host"
           fi
 
-          echo "notify=$notify" >> "$GITHUB_OUTPUT"
-          echo "environment=$environment" >> "$GITHUB_OUTPUT"
+          {
+            echo "notify=$notify"
+            echo "slack_channel=$slack_channel"
+            echo "environment=$environment"
+          } >> "$GITHUB_OUTPUT"
           cat "$GITHUB_OUTPUT"
 
   health_check:
@@ -125,13 +138,13 @@ jobs:
           cat "$GITHUB_OUTPUT"
 
       - name: Notify Failure
-        if: steps.blocks.outcome == 'success'
-        uses: mozilla/addons/.github/actions/slack@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        if: steps.blocks.outcome == 'success' && needs.context.outputs.slack_channel != ''
+        uses: mozilla/addons/.github/actions/slack@aa3c320008a837a8faa40badb88006421f63efdb
         with:
           slack_token: ${{ secrets.SLACK_TOKEN }}
           payload: |
             {
-              "channel": "${{ vars.SLACK_ADDONS_PRODUCTION_CHANNEL }}",
+              "channel": "${{ needs.context.outputs.slack_channel }}",
               "blocks": ${{ toJson(steps.blocks.outputs.blocks) }},
               "text": "[${{ needs.context.outputs.environment }}] Health check ${{ steps.health_check.outcome }}",
               # Don't unfurl links or media

.github/workflows/_test_check.yml

@@ -40,7 +40,7 @@ jobs:
       is_fork: ${{ steps.context.outputs.is_fork }}
     steps:
       - id: context
-        uses: mozilla/addons/.github/actions/context@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/context@aa3c320008a837a8faa40badb88006421f63efdb
 
   test_check:
     runs-on: ubuntu-latest

.github/workflows/ci.yml

@@ -44,7 +44,7 @@ jobs:
     steps:
       - name: Set context
         id: context
-        uses: mozilla/addons/.github/actions/context@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/context@aa3c320008a837a8faa40badb88006421f63efdb
 
       - name: Git Reference
         id: git
@@ -116,7 +116,7 @@ jobs:
       - name: Login to Dockerhub
         if: needs.context.outputs.is_fork == 'false'
         id: docker_hub
-        uses: mozilla/addons/.github/actions/login-docker@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/login-docker@aa3c320008a837a8faa40badb88006421f63efdb
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
@@ -234,6 +234,7 @@ jobs:
     uses: ./.github/workflows/_health_check.yml
     with:
       environment: host
+      slack_channel: ${{ vars.SLACK_ADDONS_PRODUCTION_CHANNEL }}
 
   test:
     needs: build
@@ -271,7 +272,7 @@ jobs:
 
       - name: Login to Dockerhub
         id: docker_hub
-        uses: mozilla/addons/.github/actions/login-docker@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/login-docker@aa3c320008a837a8faa40badb88006421f63efdb
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASS }}
@@ -308,7 +309,7 @@ jobs:
 
       - name: Login to GAR
         id: docker_gar
-        uses: mozilla/addons/.github/actions/login-gar@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/login-gar@aa3c320008a837a8faa40badb88006421f63efdb
         with:
           registry: ${{ env.registry }}
           service_account: ${{ secrets.GAR_PUSHER_SERVICE_ACCOUNT_EMAIL }}
@@ -323,11 +324,10 @@ jobs:
           version: ${{ needs.context.outputs.docker_version }}
           push: true
 
-
   notification:
     runs-on: ubuntu-latest
     name: Notification (${{ matrix.name }})
-    if: always()
+    if: needs.context.outputs.is_fork == 'false' && always()
     needs: [context, push_dockerhub, push_gar]
     strategy:
       matrix:
@@ -342,7 +342,7 @@ jobs:
     steps:
 
     - name: Slack Notification
-      uses: mozilla/addons/.github/actions/slack-workflow-notification@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+      uses: mozilla/addons/.github/actions/slack-workflow-notification@aa3c320008a837a8faa40badb88006421f63efdb
       with:
         slack_token: ${{ secrets.SLACK_TOKEN }}
         slack_channel: ${{ vars.SLACK_ADDONS_PRODUCTION_CHANNEL }}

.github/workflows/health_check.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - name: Context
         id: context
-        uses: mozilla/addons/.github/actions/context@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/context@aa3c320008a837a8faa40badb88006421f63efdb
 
   health_check:
     strategy:
@@ -42,6 +42,7 @@ jobs:
     with:
       environment: ${{ matrix.environment }}
       notify: ${{ github.event_name == 'schedule' }}
+      slack_channel: ${{ vars.SLACK_ADDONS_PRODUCTION_CHANNEL }}
 
   post_health_check:
     if: always()
@@ -65,7 +66,7 @@ jobs:
           gh workflow run health_check.yml --ref "${ref}"
 
       - name: Notify Recovery
-        uses: mozilla/addons/.github/actions/slack@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/slack@aa3c320008a837a8faa40badb88006421f63efdb
         with:
           slack_token: ${{ secrets.SLACK_TOKEN }}
           payload: |
@@ -76,7 +77,7 @@ jobs:
           dry_run: ${{ !(needs.health_check.result == 'success' && github.event_name == 'workflow_dispatch') }}
 
       - name: Notify Failure
-        uses: mozilla/addons/.github/actions/slack-workflow-notification@2406c44b0b624bcf6b9b2a8a6368c32ada25af66
+        uses: mozilla/addons/.github/actions/slack-workflow-notification@aa3c320008a837a8faa40badb88006421f63efdb
         with:
           slack_token: ${{ secrets.SLACK_TOKEN }}
           slack_channel: ${{ vars.SLACK_ADDONS_PRODUCTION_CHANNEL }}