Skip to content

Commit 206f476

Browse files
committed
misc: get ready for review
1 parent f827460 commit 206f476

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

.github/workflows/merge-main.yml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,12 @@ on:
33
schedule:
44
- cron: "0 7 * * 1-5" # At 07:00 UTC (00:00 PST, 03:00 EST), Monday through Friday
55
workflow_dispatch:
6-
# TODO: REMOVE v
7-
push:
8-
branches:
9-
- main
10-
- '*-main'
11-
pull_request:
12-
branches:
13-
- main
14-
- '*-main'
15-
# TODO: REMOVE ^
166

177
jobs:
188
test:
199
runs-on: ubuntu-latest
2010
steps:
2111
- name: Merge main
22-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@fix-auto-merge-workflow
23-
# TODO: Use main instead of feature branch ^
12+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
2413
with:
2514
exempt-branches: # Add any if required

0 commit comments

Comments
 (0)