diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 5d058dd..0e32ce6 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -1,5 +1,7 @@ name: Merge core/template-android-project to this repo + env: + CORE_REPO: "https://git.sicampus.ru/core/template-android-project.git" TOKEN: ${{ secrets.PUSH_TOKEN }} run-name: Merge core/template-android-project to ${{ gitea.repository }} @@ -14,14 +16,11 @@ jobs: runs-on: ubuntu-latest steps: - run: echo "Merge core/template-android-project to ${{ gitea.repository }}" - - run: | - git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ TOKEN }}"; }; f' - git clone https://sicampus.ru/gitea/${{ gitea.repository }} - git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git - git fetch upstream - git rebase upstream/main - 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 }}." \ No newline at end of file + - name: Check out repository code + uses: actions/checkout@v4 + - name: Sync repos + uses: Vova-SH/sync-upstream-repo@1.0.2 + with: + upstream_repo: ${{ env.CORE_REPO }} + token: ${{ env.TOKEN }} + spawn_logs: false \ No newline at end of file