more

mozilla · Feb 14, 2025 · 7ece8c2 · 7ece8c2
1 parent 2c85a66
commit 7ece8c2
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 30 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -56,24 +56,24 @@ jobs:
           echo "string=${{ inputs.string || 'goodbye' }}" >> $GITHUB_OUTPUT
           echo "optional=${{ inputs.optional }}" >> $GITHUB_OUTPUT
 
-  call_worker:
-    needs: context
-    uses: ./.github/workflows/worker.yml
-    secrets:
-       token: ${{ github.token }}
-    with:
-      boolean: ${{ fromJson(needs.context.outputs.boolean) }}
-      number: ${{ fromJson(needs.context.outputs.number) }}
-      string: ${{ needs.context.outputs.string }}
-      optional: ${{ needs.context.outputs.optional }}
+  # call_worker:
+  #   needs: context
+  #   uses: ./.github/workflows/worker.yml
+  #   secrets:
+  #      token: ${{ github.token }}
+  #   with:
+  #     boolean: ${{ fromJson(needs.context.outputs.boolean) }}
+  #     number: ${{ fromJson(needs.context.outputs.number) }}
+  #     string: ${{ needs.context.outputs.string }}
+  #     optional: ${{ needs.context.outputs.optional }}
 
-  read_worker:
-    needs: call_worker
-    runs-on: ubuntu-latest
+  # read_worker:
+  #   needs: call_worker
+  #   runs-on: ubuntu-latest
 
-    steps:
-      - shell: bash
-        run: |
-          cat <<EOF
-          ${{ toJson(needs.call_worker) }}
-          EOF
+  #   steps:
+  #     - shell: bash
+  #       run: |
+  #         cat <<EOF
+  #         ${{ toJson(needs.call_worker) }}
+  #         EOF
diff --git a/.github/workflows/default_completed.yml b/.github/workflows/default_completed.yml
@@ -2,7 +2,7 @@ name: Default (completed)
 
 on:
   workflow_run:
-    workflows: 'Default'
+    workflows: ['Default', 'Release']
     types:
       - completed
 
@@ -16,26 +16,48 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - uses: ./.github/actions/context
 
   notify_slack:
     runs-on: ubuntu-latest
     needs: [context]
-    # Only notify slack on release events
     if: ${{ needs.context.outputs.is_release_master || needs.context.outputs.is_release_tag }}
     steps:
-      - uses: actions/checkout@v4
       - name: Notify Slack
-        uses: ./.github/actions/slack
+        uses: mozilla/addons/.github/actions/slack@main
+
         env:
-          retry_text: '[Rerun Workflow](${{ github.event.workflow_run.rerun_url }})'
-          event_text: ${{ needs.context.outputs.is_release_master && 'Release Master' || 'Release Tag' }}
+          event: ${{ github.event.workflow_run.event }}
+          conclusion: ${{ github.event.workflow_run.conclusion }}
+          emoji: ${{ github.event.workflow_run.conclusion == 'success' && ':white_check_mark:' || ':x:' }}
+          workflow_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}
+          workflow_id: ${{ github.event.workflow_run.id }}
         with:
           slack_token: ${{ secrets.SLACK_TOKEN }}
           method: chat.postMessage
           payload: |
-            channel: ${{ secrets.SLACK_ADDONS_PRODUCTION_CHANNEL }}
+            channel: "${{ secrets.SLACK_ADDONS_PRODUCTION_CHANNEL }}"
+            text: "${{ env.event }} completed with ${{ env.conclusion }}"
             blocks:
-              - type: context
-                elements:
-                  - type: mrkdwn
-                    text: ":github: *Workflow Run:* ${{ github.event.workflow_run.url }}"
+            - type: section
+              text:
+                type: mrkdwn
+                text: "${{ env.emoji }} *${{ env.event }}* completed with *${{ env.conclusion }}*"
+            - type: context
+              elements:
+                - type: mrkdwn
+                  text: "*Workflow:* ${{ env.workflow_id }}"
+                - type: mrkdwn
+                  text: "*Actor:* ${{ github.event.workflow_run.actor.login }}"
+                - type: mrkdwn
+                  text: "*Commit:* ${{ github.event.workflow_run.head_commit.id }}"
+            - type: actions
+              elements:
+                - type: button
+                  text:
+                    type: plain_text
+                    text: "View Workflow"
+                    emoji: true
+                  value: workflow_url
+                  url: ${{ env.workflow_url }}
+