fix(ci): Update store-type merge logic to handle ref=main and not commit to this repo's main.

Signed-off-by: spbsoluble <[email protected]>

Author: spbsoluble

.github/workflows/update-stores.yml

@@ -28,6 +28,15 @@ jobs:
         run: |
           echo "TARGET_REPO_BRANCH=${{ github.event.client_payload.targetRef }}" | tee -a $GITHUB_ENV
           echo "KFUTIL_ARG=${{ github.event.client_payload.targetRepo }}" | tee -a $GITHUB_ENV
+      - name: Set Branch Name based on targetRef
+        id: set-branch-name
+        run: |
+          if [ "${{ env.TARGET_REPO_BRANCH }}" == "main" ]; then
+            echo "BRANCH_NAME=${{ env.KFUTIL_ARG }}_${{ env.TARGET_REPO_BRANCH }}" | tee -a $GITHUB_ENV
+          else
+            echo "BRANCH_NAME=${{ env.KFUTIL_ARG }}" | tee -a $GITHUB_ENV
+          fi
+
       - name: Check Open PRs for Existing Branch
         id: check-branch
         uses: actions/github-script@v7
@@ -41,8 +50,8 @@ jobs:
               repo,
               state: "open"
             });
-            // Filter out ones matching the KFUTIL_ARG from payload (repository_dispatch) or input (workflow_dispatch)
-            const filteredData = pulls.data.filter(item => item.head.ref === '${{ env.KFUTIL_ARG }}'); // Look for an existing branch with the orchestrator repo name
+            // Filter out ones matching our branch naming convention
+            const filteredData = pulls.data.filter(item => item.head.ref === '${{ env.BRANCH_NAME }}');
             const isBranch = (filteredData.length > 0)
             if (isBranch) {
               const {
@@ -54,25 +63,25 @@ jobs:
             } else {
               core.setOutput('PR_BRANCH', 'create') // No branch, create one
             }
-            console.log(`Branch exists?`)
-            console.log(filteredData.length > 0)
-            console.log(`targetRepo: ${{env.KFUTIL_ARG}}`)
+            console.log(`Branch exists? ${filteredData.length > 0}`)
+            console.log(`Branch name: ${{env.BRANCH_NAME}}`)
+
       - name: set env.PR_BRANCH value for jobs
         run: |
           echo "PR_BRANCH=${{steps.check-branch.outputs.PR_BRANCH}}" | tee -a $GITHUB_ENV
 
       # If the branch with an open PR already exists, first check out that branch from kfutil
       - name: Check out existing repo merge branch
-        if: env.PR_BRANCH == 'commit'
-        uses: actions/checkout@v4
-        with:
-          repository: 'keyfactor/kfutil'
-          sparse-checkout: |
-            .github
-            cmd
-          path: './merge-folder/'
-          token: ${{ secrets.V2BUILDTOKEN }}
-          ref: '${{env.KFUTIL_ARG}}'
+          if: env.PR_BRANCH == 'commit'
+          uses: actions/checkout@v4
+          with:
+            repository: 'keyfactor/kfutil'
+            sparse-checkout: |
+              .github
+              cmd
+            path: './merge-folder/'
+            token: ${{ secrets.V2BUILDTOKEN }}
+            ref: '${{env.BRANCH_NAME}}'
 
       # If the branch does not exist, first check out the main branch from kfutil.
       - name: Check out main
@@ -160,13 +169,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
         with:
           add: |
-            store_types.json 
+            store_types.json
             ./cmd/store_types.json --force
           message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
           author_name: Keyfactor
           author_email: [email protected]
           cwd: './merge-folder/'
-          new_branch: ${{env.KFUTIL_ARG}}
+          new_branch: ${{env.BRANCH_NAME}}
 
       - name: Add and Commit to existing branch
         if: ${{ env.UPDATE_FILE == 'T' && env.PR_BRANCH == 'commit' }}
@@ -187,18 +196,14 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            console.log(`Created ${{env.KFUTIL_ARG}} `)
-            console.log("Commit to ${{env.KFUTIL_ARG}} for PR")
+            console.log(`Created ${{env.BRANCH_NAME}} `)
+            console.log("Commit to ${{env.BRANCH_NAME}} for PR")
             const owner = context.repo.owner;
             const repo = context.repo.repo;
-
-            // Get the current branch name that the workflow is running on
-            const baseBranch = context.payload.ref ? 
+            const baseBranch = context.payload.ref ?
               context.payload.ref.replace('refs/heads/', '') : 'main';
-            
             console.log(`Base branch for PR: ${baseBranch}`);
-            
-            const newBranch = '${{env.KFUTIL_ARG}}';
+            const newBranch = '${{env.BRANCH_NAME}}';
             const response = await github.rest.pulls.create({
               owner,
               repo,
@@ -208,5 +213,3 @@ jobs:
               body: 'The cert store update from ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}} needs to be verified and merged if correct.',
             });
             console.log(`Pull request created: ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}} : ${response.data.html_url}`);
-        env:
-          GITHUB_TOKEN: ${{ secrets.V2BUILDTOKEN }}