Skip to content

Commit 6428663

Browse files
committed
set the right branch in workflow:(
1 parent c538a2e commit 6428663

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/actions/merge-main/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ inputs:
77
runs:
88
using: composite
99
steps:
10+
- name: Checkout repository
11+
uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
14+
ssh-key: ${{ secrets.CI_USER_PAT }}
15+
1016
- name: Set up Git
1117
shell: bash
1218
run: |
1319
git config user.name aws-sdk-kotlin-ci
1420
git config user.email "[email protected]"
1521
16-
- name: Checkout repository
17-
uses: actions/checkout@v4
18-
with:
19-
fetch-depth: 0
20-
ssh-key: ${{ secrets.CI_USER_SSH_KEY }}
21-
2222
- name: Run Script
2323
shell: bash
2424
run: |

.github/workflows/merge-main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Merge main
13-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
13+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@fix-auto-merge-credentials
1414
with:
1515
exempt-branches: # Add any if required

0 commit comments

Comments
 (0)