Skip to content

Commit 5602c47

Browse files
committed
Merge branch 'release51' into release52
2 parents 2948cce + 1690156 commit 5602c47

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

.github/workflows/prune-container-images.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88
jobs:
99
prune-container-images:
1010
if: ${{ github.repository_owner == 'Sofie-Automation' }}
11-
1211
uses: Sofie-Automation/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
1312
strategy:
1413
max-parallel: 1

.github/workflows/trivy.yml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -63,32 +63,32 @@ jobs:
6363
echo "SUMMARY=$summary" >> $GITHUB_ENV
6464
echo ${{ env.SUMMARY }}
6565
66-
- name: Send Slack Notification
67-
uses: slackapi/slack-github-action@v2.0.0
68-
with:
69-
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
70-
webhook-type: incoming-webhook
71-
payload: |
72-
text: "Trivy scan results"
73-
blocks:
74-
- type: "header"
75-
text:
76-
type: "plain_text"
77-
text: "Trivy scan results for sofie-core-${{ matrix.image }}:latest"
78-
- type: "section"
79-
text:
80-
type: "mrkdwn"
81-
text: ":thisisfine: ${{ env.SUMMARY }}"
82-
- type: "section"
83-
text:
84-
type: "mrkdwn"
85-
text: "Read the full scan results on Github"
86-
accessory:
87-
type: "button"
88-
text:
89-
type: "plain_text"
90-
text: ":github: Scan results"
91-
emoji: true
92-
value: "workflow_run"
93-
url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
94-
action_id: "button-action"
66+
# - name: Send Slack Notification
67+
# uses: slackapi/slack-github-action@v2.1.0
68+
# with:
69+
# webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
70+
# webhook-type: incoming-webhook
71+
# payload: |
72+
# text: "Trivy scan results"
73+
# blocks:
74+
# - type: "header"
75+
# text:
76+
# type: "plain_text"
77+
# text: "Trivy scan results for sofie-core-${{ matrix.image }}:latest"
78+
# - type: "section"
79+
# text:
80+
# type: "mrkdwn"
81+
# text: ":thisisfine: ${{ env.SUMMARY }}"
82+
# - type: "section"
83+
# text:
84+
# type: "mrkdwn"
85+
# text: "Read the full scan results on Github"
86+
# accessory:
87+
# type: "button"
88+
# text:
89+
# type: "plain_text"
90+
# text: ":github: Scan results"
91+
# emoji: true
92+
# value: "workflow_run"
93+
# url: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
94+
# action_id: "button-action"

0 commit comments

Comments
 (0)