Skip to content

Commit 2eaab47

Browse files
Update Automated_merge.yml
1 parent a1f37c3 commit 2eaab47

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

.github/workflows/Automated_merge.yml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,46 +11,46 @@ jobs:
1111
dev-to-nightly:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- name: Check the weekday
14+
- name: Check weekday
1515
id: check-day
1616
run: |
17-
# +%u returns a number for day of week: Monday=1 ... Sunday=7
17+
# Monday=1 ... Friday=5 ... Sunday=7
1818
DAY_OF_WEEK=$(date +'%u')
1919
echo "day_of_week=$DAY_OF_WEEK" >> $GITHUB_OUTPUT
2020
2121
- name: Create and merge PR from dev to release/nightly
2222
if: ${{ steps.check-day.outputs.day_of_week != '5' }}
23-
uses: peter-evans/create-pull-request@v3
23+
uses: peter-evans/create-pull-request@v7
2424
with:
2525
token: ${{ secrets.GITHUB_TOKEN }}
26-
base: release/nightly
27-
head: dev
26+
source-branch: dev
27+
target-branch: release/nightly
28+
branch: auto/dev-to-nightly
2829
title: "Nightly Merge: dev → release/nightly"
2930
body: "This PR was automatically created and merged by GitHub Actions."
30-
branch: "auto/dev-to-nightly"
31-
merge: true
32-
merge_method: squash
31+
auto-merge: true
32+
merge-method: squash
3333

3434
# Job 2: Merge release/nightly -> release/beta (run only on Friday)
3535
nightly-to-beta:
3636
runs-on: ubuntu-latest
3737
needs: [dev-to-nightly]
3838
steps:
39-
- name: Check the weekday
39+
- name: Check weekday
4040
id: check-day
4141
run: |
4242
DAY_OF_WEEK=$(date +'%u')
4343
echo "day_of_week=$DAY_OF_WEEK" >> $GITHUB_OUTPUT
4444
4545
- name: Create and merge PR from release/nightly to release/beta
4646
if: ${{ steps.check-day.outputs.day_of_week == '5' }}
47-
uses: peter-evans/create-pull-request@v3
47+
uses: peter-evans/create-pull-request@v7
4848
with:
4949
token: ${{ secrets.GITHUB_TOKEN }}
50-
base: release/beta
51-
head: release/nightly
50+
source-branch: release/nightly
51+
target-branch: release/beta
52+
branch: auto/nightly-to-beta
5253
title: "Weekly Merge: release/nightly → release/beta"
5354
body: "This PR was automatically created and merged by GitHub Actions."
54-
branch: "auto/nightly-to-beta"
55-
merge: true
56-
merge_method: squash
55+
auto-merge: true
56+
merge-method: squash

0 commit comments

Comments
 (0)