Branch was auto-updated.

splunk · Jul 31, 2024 · faa7434 · faa7434
2 parents 8420867 + 49c8925
commit faa7434
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.github/workflows/unit-testing.yml b/.github/workflows/unit-testing.yml
@@ -36,11 +36,10 @@ jobs:
             echo "Current Branch (Head Ref): ${{ github.head_ref }}"
             echo "Target Branch (Base Ref): ${{ github.base_ref }}"
             git pull > /dev/null 2>&1
-            git fetch origin pull/${{ github.event.pull_request.number }}/head:${{ github.head_ref }}
-            #We must specifically get the PR's target branch from security_content, not the one that resides in the fork PR's forked repo
-            git switch ${{ github.head_ref }}
-            #git checkout ${{ github.head_ref }}
-            #echo "The target branch for this PR is ${{ github.base_ref }}"
+            #We checkout into a new branch - new_branch_for_testing to avoid name collisions with develop incase the forked PR is from develop
+            git fetch origin pull/${{ github.event.pull_request.number }}/head:new_branch_for_testing
+            #We must specifically get the PR's target branch from security_content, not the one that resides in the fork PR's forked repo           
+            git switch new_branch_for_testing
             contentctl test --disable-tqdm --no-enable-integration-testing --post-test-behavior never_pause mode:changes --mode.target-branch ${{ github.base_ref }}
             echo "contentctl test - COMPLETED"
           continue-on-error: true
@@ -65,4 +64,4 @@ jobs:
           run: |       
             echo "This job will fail if there are failures in unit-testing"  
             python .github/workflows/format_test_results.py >> $GITHUB_STEP_SUMMARY
-            echo "The Unit testing is completed. See details in the unit-testing job summary UI "
+            echo "The Unit testing is completed. See details in the unit-testing job summary UI "