mirror of
https://github.com/quatalog/site.git
synced 2024-12-25 14:36:55 +00:00
Create merge.yml
This commit is contained in:
parent
97ec9cc21f
commit
a8d16fb092
32
.github/workflows/merge.yml
vendored
Normal file
32
.github/workflows/merge.yml
vendored
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
name: Merge main into static-generated
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
merge-branches:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
steps:
|
||||||
|
- name: Checkout main
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Checkout static-generated
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: static-generated
|
||||||
|
token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- name: Merge branches manually
|
||||||
|
run: |
|
||||||
|
git config --global user.name "Quatalog Updater"
|
||||||
|
git config --global user.email "github_actions@quatalog.com"
|
||||||
|
|
||||||
|
git checkout main
|
||||||
|
git checkout -b new-static-generated
|
||||||
|
git merge static-generated --allow-unrelated-histories
|
||||||
|
|
||||||
|
git push -u -f origin HEAD:static-generated
|
Loading…
Reference in a new issue