Обновить .gitea/workflows/automerge-with-core.yaml

.gitea/workflows/automerge-with-core.yaml

@@ -1,5 +1,9 @@
 name: Merge core/template-android-project to this repo
 
+env:
+  CORE_URL: "https://git.sicampus.ru/core/template-android-project.git"
+  TOKEN: ${{ secrets.PUSH_TOKEN }}
+
 run-name: Merge core/template-android-project to ${{ gitea.repository }}
 on: 
   push:
@@ -12,26 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
-      - run: |
+      - name: Check out repository code
-          git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ secrets.PUSH_TOKEN }}"; }; f'
+        uses: actions/checkout@v4
-          git config --global user.email "test@bot.com"
+      - name: Sync repos
-          git config --global user.name "Bot"
+        uses: dabreadman/sync-upstream-repo@v1.3.0
-      - run: git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo
+        with:
-      - run: |
+          upstream_repo: ${{ env.CORE_REPO }}
-          cd /repo
+          token: ${{ env.TOKEN }}
-          git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
+          spawn_logs: true
-      - run: |
-          cd /repo
-          git fetch upstream
-      - run: |
-          cd /repo
-          git rebase upstream/main -s ours
-      - run: |
-          cd /repo
-          git push --force
-      - 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 "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - run: echo "🍏 This job's status is ${{ job.status }}."
-      - run: echo "I'm merge correct"