Skip to content

Commit 8f36e0b

Browse files
committed
refactor: another try
1 parent 2ebcc0e commit 8f36e0b

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
1-
name: Sync release-candidate Branch with Main
1+
name: Update release-candidate Branch
22

33
on:
44
push:
55
branches:
66
- main
77

88
jobs:
9-
sync-release-candidate:
9+
update-release-candidate-branch:
1010
runs-on: ubuntu-latest
11-
1211
steps:
13-
- name: Checkout Main Branch
14-
uses: actions/checkout@v4
12+
- name: Checkout repository
13+
uses: actions/checkout@v3
1514
with:
16-
ref: main
15+
fetch-depth: 0
1716

18-
- name: Checkout release-candidate Branch
17+
- name: Update release-candidate branch
1918
run: |
20-
git fetch origin release-candidate
19+
git config user.name github-actions
20+
git config user.email [email protected]
2121
git checkout release-candidate
22-
23-
- name: Merge Main into release-candidate
24-
run: |
25-
git merge main
22+
git merge origin/main
2623
git push origin release-candidate
27-
env:
28-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)