Skip to content

Commit e7b4959

Browse files
fix(git-action): test merge main back to beta
1 parent f9850ee commit e7b4959

File tree

1 file changed

+26
-1
lines changed

1 file changed

+26
-1
lines changed

.github/workflows/main.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,29 @@ jobs:
140140
with:
141141
github_token: ${{ secrets.GITHUB_TOKEN }}
142142
publish_dir: coverage
143-
# cname:
143+
144+
merge-back-to-beta:
145+
needs: semantic-version
146+
strategy:
147+
matrix:
148+
os: [ubuntu-latest]
149+
node: [20]
150+
151+
runs-on: ${{ matrix.os }}
152+
153+
steps:
154+
- name: checkout repo
155+
uses: actions/checkout@v4
156+
157+
- name: set git config
158+
run: |
159+
git config --local user.email "[email protected]"
160+
git config --local user.name "Github Actions"
161+
162+
- name: merge main back to beta
163+
run: |
164+
git fetch --unshallow
165+
git checkout dev
166+
git pull
167+
git merge --no-ff main -m "Auto-merge main back to beta"
168+
git push

0 commit comments

Comments
 (0)