mirror of
https://github.com/quatalog/site.git
synced 2024-12-30 08:47:01 +00:00
34 lines
951 B
YAML
34 lines
951 B
YAML
|
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 --orphan new-static-generated
|
||
|
git commit -m '${{ github.event.head_commit.message }}'
|
||
|
git merge static-generated --strategy-option ours --allow-unrelated-histories
|
||
|
|
||
|
git push -u -f origin HEAD:static-generated
|