Merge pull request #634 from RafaySystems/branch-cut-fix

Hard-coded the source branch as master in branch-cut workflow.
RafaySystems · Aug 5, 2024 · cecb817 · cecb817
2 parents 600200e + 1b95814
commit cecb817
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/branch-cut.yaml b/.github/workflows/branch-cut.yaml
@@ -6,7 +6,7 @@ on:
       source_branch:
         description: 'Source branch name from which branch cut need to be done.'
         required: true
-        default: main|master
+        default: master
       release_branch:
         description: 'New branch release branch name'
         required: true
@@ -25,7 +25,7 @@ jobs:
       run: |
         git fetch --all
         if [ "${{ github.event.inputs.source_branch }}" == 'main|master' ] || [ "${{ github.event.inputs.source_branch }}" == 'master|main' ]; then
-            SOURCE_BRANCH=$(git remote set-head origin -a | egrep -oE 'master|main$')
+            SOURCE_BRANCH='master'
             echo source_branch=$SOURCE_BRANCH
         else 
             SOURCE_BRANCH="${{ github.event.inputs.source_branch }}"

diff --git a/.github/workflows/branch-tag.yaml b/.github/workflows/branch-tag.yaml
@@ -16,7 +16,9 @@ jobs:
 
     steps:
     - name: Checkout PR Branch
-      uses: actions/checkout@v4 # This action checks out the branch associated with the PR
+      uses: actions/checkout@v4  # This action checks out the branch associated with the PR
+      with:
+        token: ${{ secrets.JENKINS_PAT }}
 
     - name: Set Git config
       run: |