Skip to content

Commit 5e96c91

Browse files
committed
misc: squash test commits
1 parent caedfe6 commit 5e96c91

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ description: Merges main into feature branches (*-main)
33
inputs:
44
exempt-branches:
55
description: Feature branches that are exempt from receiving merges from main (comma separated, no blank space)
6+
ci-user-pat:
7+
description: The CI user's personal access token to write to the repo
68

79
runs:
810
using: composite
@@ -11,6 +13,7 @@ runs:
1113
uses: actions/checkout@v4
1214
with:
1315
fetch-depth: 0
16+
token: ${{ inputs.ci-user-pat }}
1417

1518
- name: Set up Git
1619
shell: bash

.github/workflows/merge-main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches: [ main ]
55
workflow_dispatch:
6+
pull_request:
67

78
jobs:
89
merge:
@@ -11,4 +12,5 @@ jobs:
1112
- name: Merge main
1213
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
1314
with:
15+
ci-user-pat: ${{ secrets.CI_USER_PAT }}
1416
exempt-branches: # Add any if required

0 commit comments

Comments
 (0)