Skip to content

Commit 3847aaf

Browse files
Merge pull request #222 from NHSDigital/dependabot/github_actions/dependencies-73ff4de37f
MESH-2092 Bump mikepenz/action-junit-report from 6.1.0 to 6.2.0 in the dependencies group
2 parents d53f73e + 08bfa93 commit 3847aaf

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/dependabot-auto-merge.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
enable-automerge:
1414
# Only run on Dependabot PRs
15-
if: github.event.pull_request.user.login == 'dependabot[bot]'
15+
if: github.actor == 'dependabot[bot]'
1616
runs-on: ubuntu-latest
1717
permissions:
1818
contents: write

.github/workflows/merge-develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898

9999
- name: publish junit reports
100100
if: success() || failure()
101-
uses: mikepenz/action-junit-report@a294a61c909bd8a4b563024a2faa28897fd53ebc
101+
uses: mikepenz/action-junit-report@74626db7353a25a20a72816467ebf035f674c5f8
102102
with:
103103
check_name: junit reports
104104
report_paths: reports/junit/*.xml

.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140

141141
- name: publish junit reports
142142
if: success() || failure()
143-
uses: mikepenz/action-junit-report@a294a61c909bd8a4b563024a2faa28897fd53ebc
143+
uses: mikepenz/action-junit-report@74626db7353a25a20a72816467ebf035f674c5f8
144144
with:
145145
check_name: junit reports
146146
report_paths: reports/junit/*.xml
@@ -318,7 +318,7 @@ jobs:
318318
needs:
319319
- coverage
320320
- lint
321-
if: ${{ always() && github.repository == 'NHSDigital/mesh-sandbox' && github.event.pull_request.user.login == 'dependabot[bot]' && contains(needs.*.result, 'failure') }}
321+
if: ${{ always() && github.repository == 'NHSDigital/mesh-sandbox' && github.actor== 'dependabot[bot]' && contains(needs.*.result, 'failure') }}
322322
steps:
323323
- name: Slack Notification
324324
uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a

0 commit comments

Comments
 (0)