Merge pull request #118 from fantonangeli/SRVLOGIC-633-Fix-token-issues-and-redesign-of-upstream-sync-CI

SRVLOGIC-633: Redesign of upstream-sync CI

Author: mareknovotny

.github/workflows/main-sync.yml

@@ -1,22 +1,36 @@
 name: Sync main branch
 
-env:
-  GITHUB_TOKEN: ${{ secrets.APACHE_SYNC_MIDSTREAM_TOKEN }}
-
 on:
   schedule:
     - cron:  '0 1 * * 0' 
   workflow_dispatch:
 
+permissions:
+  contents: write
+  pull-requests: write
+
+concurrency: 
+  group: sync-main
+  cancel-in-progress: true
+
 jobs:
   sync-main:
     if: github.repository_owner == 'kiegroup'
     name: Sync main branch
     runs-on: ubuntu-latest
 
     steps:
-      - name: Create a PR to sync main branch with main-apache
-        uses: kiegroup/kie-ci/.ci/actions/main-sync@main
+      - name: Merge local branch with upstream/main (no commit)
+        id: merge_upstream_main
+        uses: kiegroup/kie-ci/.ci/actions/main-sync/merge@main
+        with:
+          exclude_paths: ${{ vars.MAIN_SYNC_WORKFLOW_EXCLUDE_PATHS }}
+          upstream_remote: ${{ vars.UPSTREAM_URL }}
+          github_token: ${{ secrets.APACHE_SYNC_MIDSTREAM_TOKEN }}
+
+      - name: Create a PR to sync main branch with upstream/main
+        uses: kiegroup/kie-ci/.ci/actions/main-sync/create-pr@main
         with:
-          main_sync_workflow_exclude_paths: ${{ vars.MAIN_SYNC_WORKFLOW_EXCLUDE_PATHS }}
-          main_sync_workflow_pr_reviewers: ${{ vars.MAIN_SYNC_WORKFLOW_PR_REVIEWERS }}
+          pr_reviewers: ${{ vars.MAIN_SYNC_WORKFLOW_PR_REVIEWERS }}
+          sync_branch: ${{ steps.merge_upstream_main.outputs.sync_branch }}
+          github_token: ${{ secrets.APACHE_SYNC_MIDSTREAM_TOKEN }}