Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
parent
59f3a637ca
commit
5ff54b2739
@ -1,4 +1,6 @@
|
|||||||
name: Merge core/template-android-project to this repo
|
name: Merge core/template-android-project to this repo
|
||||||
|
env:
|
||||||
|
TOKEN: ${{ secrets.PUSH_TOKEN }}
|
||||||
|
|
||||||
run-name: Merge core/template-android-project to ${{ gitea.repository }}
|
run-name: Merge core/template-android-project to ${{ gitea.repository }}
|
||||||
on:
|
on:
|
||||||
@ -13,10 +15,21 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
|
- run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
|
||||||
- run: |
|
- run: |
|
||||||
|
git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ TOKEN }}"; }; f'
|
||||||
|
echo "Cloning Core"
|
||||||
|
git clone https://sicampus.ru/gitea/core/template-android-project /core
|
||||||
|
echo "Cloning Repo"
|
||||||
git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo
|
git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo
|
||||||
cd /repo
|
cd /repo
|
||||||
git merge --allow-unrelated-histories https://sicampus.ru/gitea/core/template-android-project/${{ gitea.ref }}
|
echo "Cloning Remote core"
|
||||||
git log
|
git remote add core /core
|
||||||
|
echo "Cloning Fetch core"
|
||||||
|
git fetch core
|
||||||
|
echo "Cloning Merge core"
|
||||||
|
git merge --allow-unrelated-histories -Xours core/main
|
||||||
|
echo "Cloning Push core"
|
||||||
|
git push --force
|
||||||
|
echo "OK"
|
||||||
- run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
|
- run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
|
||||||
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
|
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
|
||||||
- run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
|
- run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
|
||||||
|
Loading…
x
Reference in New Issue
Block a user