Skip to content

Commit 78f9e4e

Browse files
committed
include everything in commit
1 parent 4671932 commit 78f9e4e

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ runs:
99
steps:
1010
- name: Checkout repository
1111
uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
1214

1315
- name: Set up Git
1416
shell: bash

.github/workflows/merge-main.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,23 @@ 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 ^
616

717
jobs:
818
test:
919
runs-on: ubuntu-latest
1020
steps:
1121
- name: Merge main
12-
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
22+
uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@auto-merge
23+
# TODO: Use main instead of feature branch ^
1324
with:
1425
exempt-branches: # Add any if required

0 commit comments

Comments
 (0)