Skip to content

Commit 94edf58

Browse files
author
Pankaj Agrawal
committed
chore: Fix failing build and auto merge only when build is success
1 parent dfd870c commit 94edf58

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/auto-merge.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: Auto merge if dependabot PR
22

33
on:
44
workflow_run:
5-
workflows: ["Build", "SpotBugs"]
5+
workflows: ["Build"]
66
types: [completed]
77

88
jobs:
99
merge-me:
1010
name: Merge me!
1111
runs-on: ubuntu-latest
12-
if: github.event.workflow_run.event == 'pull_request' && github.actor == 'dependabot[bot]'
12+
if: github.event.workflow_run.event == 'pull_request' && github.event.workflow_run.conclusion == 'success' && github.actor == 'dependabot[bot]'
1313
steps:
1414
- uses: actions/checkout@v2
1515
- uses: ahmadnassri/action-workflow-run-wait@v1

powertools-parameters/src/test/java/software/amazon/lambda/powertools/parameters/internal/LambdaParametersAspectTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testDefault_ShouldUseSSMProvider() {
4949
when(defaultProvider.get("/default")).thenReturn("value");
5050

5151
assertThat(defaultValue).isEqualTo("value");
52-
mocked.verify(times(1), () -> ParamManager.getProvider(SSMProvider.class));
52+
mocked.verify(() -> ParamManager.getProvider(SSMProvider.class), times(1));
5353
verify(defaultProvider, times(1)).get("/default");
5454

5555
mocked.reset();

0 commit comments

Comments
 (0)