From 9a37e36501c9f330f4c1578343fe3f55cb8031a8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Feb 2026 03:37:26 +0000 Subject: [PATCH 1/6] MESH-2092 Bump mikepenz/action-junit-report in the dependencies group Bumps the dependencies group with 1 update: [mikepenz/action-junit-report](https://github.com/mikepenz/action-junit-report). Updates `mikepenz/action-junit-report` from 6.1.0 to 6.2.0 - [Release notes](https://github.com/mikepenz/action-junit-report/releases) - [Commits](https://github.com/mikepenz/action-junit-report/compare/a294a61c909bd8a4b563024a2faa28897fd53ebc...74626db7353a25a20a72816467ebf035f674c5f8) --- updated-dependencies: - dependency-name: mikepenz/action-junit-report dependency-version: 6.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: dependencies ... Signed-off-by: dependabot[bot] --- .github/workflows/merge-develop.yml | 2 +- .github/workflows/pull-request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-develop.yml b/.github/workflows/merge-develop.yml index e1b8e99..9625fc3 100644 --- a/.github/workflows/merge-develop.yml +++ b/.github/workflows/merge-develop.yml @@ -98,7 +98,7 @@ jobs: - name: publish junit reports if: success() || failure() - uses: mikepenz/action-junit-report@a294a61c909bd8a4b563024a2faa28897fd53ebc + uses: mikepenz/action-junit-report@74626db7353a25a20a72816467ebf035f674c5f8 with: check_name: junit reports report_paths: reports/junit/*.xml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 17d9258..0c73497 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -140,7 +140,7 @@ jobs: - name: publish junit reports if: success() || failure() - uses: mikepenz/action-junit-report@a294a61c909bd8a4b563024a2faa28897fd53ebc + uses: mikepenz/action-junit-report@74626db7353a25a20a72816467ebf035f674c5f8 with: check_name: junit reports report_paths: reports/junit/*.xml From 28a61f38a833eca0ece5ccd35c6eed71738bf81e Mon Sep 17 00:00:00 2001 From: James Date: Wed, 4 Feb 2026 10:51:25 +0000 Subject: [PATCH 2/6] mesh-2092: test comment --- src/mesh_sandbox/tests/exceptions.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/mesh_sandbox/tests/exceptions.py b/src/mesh_sandbox/tests/exceptions.py index 372ab91..00dbf52 100644 --- a/src/mesh_sandbox/tests/exceptions.py +++ b/src/mesh_sandbox/tests/exceptions.py @@ -20,3 +20,6 @@ def test_parse_simple_error_with_message_id(): assert res["errorEvent"] == "SEND" assert res["errorDescription"] == constants.ERROR_NO_MAILBOX_MATCHES assert res["messageID"] == message_id + + +# COMMENT TO DELETE From 3ecf37ec71b38ed3f8ee2aa248b4a066fbeefdb9 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 4 Feb 2026 10:55:34 +0000 Subject: [PATCH 3/6] mesh-2092: revert test comment --- src/mesh_sandbox/tests/exceptions.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/mesh_sandbox/tests/exceptions.py b/src/mesh_sandbox/tests/exceptions.py index 00dbf52..372ab91 100644 --- a/src/mesh_sandbox/tests/exceptions.py +++ b/src/mesh_sandbox/tests/exceptions.py @@ -20,6 +20,3 @@ def test_parse_simple_error_with_message_id(): assert res["errorEvent"] == "SEND" assert res["errorDescription"] == constants.ERROR_NO_MAILBOX_MATCHES assert res["messageID"] == message_id - - -# COMMENT TO DELETE From e54c950198fc0f67e0c6fcc903fdfabea5fbc4aa Mon Sep 17 00:00:00 2001 From: James Date: Wed, 4 Feb 2026 10:55:58 +0000 Subject: [PATCH 4/6] mesh-2092: break test --- src/mesh_sandbox/tests/mesh_client_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh_sandbox/tests/mesh_client_tests.py b/src/mesh_sandbox/tests/mesh_client_tests.py index 3837abd..6a3c360 100644 --- a/src/mesh_sandbox/tests/mesh_client_tests.py +++ b/src/mesh_sandbox/tests/mesh_client_tests.py @@ -74,7 +74,7 @@ def test_send_receive_chunked_message(base_uri: str): with MeshClient(url=base_uri, mailbox=_CANNED_MAILBOX2, password=_PASSWORD, shared_key=_SHARED_KEY) as recipient: message_ids = recipient.list_messages() - assert message_ids == [message_id] + assert message_ids == [message_id, 1] message = recipient.retrieve_message(message_id) assert message.workflow_id == workflow_id # pylint: disable=no-member received_payload = message.read() From 8134816c75d8b89c2a0e642ef6fbbe56a116470c Mon Sep 17 00:00:00 2001 From: James Date: Wed, 4 Feb 2026 14:13:46 +0000 Subject: [PATCH 5/6] mesh-2092: revert failing test --- src/mesh_sandbox/tests/mesh_client_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh_sandbox/tests/mesh_client_tests.py b/src/mesh_sandbox/tests/mesh_client_tests.py index 6a3c360..3837abd 100644 --- a/src/mesh_sandbox/tests/mesh_client_tests.py +++ b/src/mesh_sandbox/tests/mesh_client_tests.py @@ -74,7 +74,7 @@ def test_send_receive_chunked_message(base_uri: str): with MeshClient(url=base_uri, mailbox=_CANNED_MAILBOX2, password=_PASSWORD, shared_key=_SHARED_KEY) as recipient: message_ids = recipient.list_messages() - assert message_ids == [message_id, 1] + assert message_ids == [message_id] message = recipient.retrieve_message(message_id) assert message.workflow_id == workflow_id # pylint: disable=no-member received_payload = message.read() From 08bfa9398e378e00d35f83f5640e8e408bc5cbbc Mon Sep 17 00:00:00 2001 From: James Date: Wed, 4 Feb 2026 14:18:12 +0000 Subject: [PATCH 6/6] mesh-2092: use github.actor --- .github/workflows/dependabot-auto-merge.yaml | 2 +- .github/workflows/pull-request.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml index 28a1941..95f57ed 100644 --- a/.github/workflows/dependabot-auto-merge.yaml +++ b/.github/workflows/dependabot-auto-merge.yaml @@ -12,7 +12,7 @@ on: jobs: enable-automerge: # Only run on Dependabot PRs - if: github.event.pull_request.user.login == 'dependabot[bot]' + if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 0c73497..e8ab100 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -318,7 +318,7 @@ jobs: needs: - coverage - lint - if: ${{ always() && github.repository == 'NHSDigital/mesh-sandbox' && github.event.pull_request.user.login == 'dependabot[bot]' && contains(needs.*.result, 'failure') }} + if: ${{ always() && github.repository == 'NHSDigital/mesh-sandbox' && github.actor== 'dependabot[bot]' && contains(needs.*.result, 'failure') }} steps: - name: Slack Notification uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a