Merge pull request #2309 from AllenInstitute/bugfix/2309-branch-prote…

…ction-bug-backport Backport: Remove colon from job name
AllenInstitute · Dec 15, 2024 · c2f4182 · c2f4182
2 parents d6d193a + dc29f2d
commit c2f4182
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -115,8 +115,7 @@ jobs:
         run: tools/pre-commit/run.sh
 
   CompilationTest:
-    name: |
-      👩🏾‍🔬 Compilation: ${{ matrix.source }} ${{ fromJSON('["","with XOP"]')[matrix.hardware] }}
+    name: 👩🏾‍🔬 Compilation of ${{ matrix.source }} ${{ fromJSON('["","with XOP"]')[matrix.hardware] }}
     needs:
       - BuildInstaller
     strategy:
@@ -129,8 +128,7 @@ jobs:
             hardware: false
     uses: ./.github/workflows/test-igor-workflow.yml
     with:
-      job_name: |
-        👩🏾‍🔬 Compilation: ${{ matrix.source }} ${{ fromJSON('["","with XOP"]')[matrix.hardware] }}
+      job_name: 👩🏾‍🔬 Compilation of ${{ matrix.source }} ${{ fromJSON('["","with XOP"]')[matrix.hardware] }}
       overwrite_job_name: ${{ inputs.is_called_workflow || false }}
       experiment: Packages/tests/Compilation/CompilationTester.pxp
       installer_artifact_name: BuildInstaller-dev-assets
@@ -139,13 +137,11 @@ jobs:
       timeout_minutes: 60
 
   CompilationEachCommitTest:
-    name: |
-      👩🏾‍🔬 Compilation: Each commit
+    name: 👩🏾‍🔬 Compilation of each commit
     if: ${{ !inputs.is_called_workflow }}
     uses: ./.github/workflows/test-igor-rebase-exec-workflow.yml
     with:
-      job_name: |
-        👩🏾‍🔬 Compilation: Each commit
+      job_name: 👩🏾‍🔬 Compilation of each commit
       overwrite_job_name: ${{ inputs.is_called_workflow || false }}
       experiment: Packages/tests/Compilation/CompilationTester.pxp
       installer_flags: "-s git"

diff --git a/.github/workflows/test-igor-rebase-exec-workflow.yml b/.github/workflows/test-igor-rebase-exec-workflow.yml
@@ -78,15 +78,23 @@ jobs:
           ref: ${{ github.sha }}
       - name: Initial repo config
         run: tools/initial-repo-config.sh
+      - name: Get latest release branch
+        run: |
+             CI_RELEASE_BRANCH=$(git branch --sort="version:refname" -rl "origin/release*" | tail -n1)
+             echo "CI_RELEASE_BRANCH=$CI_RELEASE_BRANCH" >> $GITHUB_ENV
+      - name: Gather base branch
+        run: |
+             CI_BASE_BRANCH=$((git merge-base --is-ancestor ${{ env.CI_RELEASE_BRANCH }} HEAD && echo "${{ env.CI_RELEASE_BRANCH }}") || echo "origin/main")
+             echo "CI_BASE_BRANCH=$CI_BASE_BRANCH" >> $GITHUB_ENV
       - name: List of commits to operate on
-        run: git log --pretty=ref origin/main..
+        run: git log --pretty=ref ${{ env.CI_BASE_BRANCH }}..
       - name: Cleanup earlier rebase invocations
         run: git rebase --quit 2>/dev/null || true
       - name: Compile check each commit with ${{ inputs.experiment }}
         run: |
              git rebase --exec "git log --pretty=ref -n1"                                                \
                         --exec "tools/clean_mies_installation.sh ${{ inputs.installer_flags }}"          \
-                        --exec "tools/autorun-test.sh -p ${{ inputs.experiment }} -v IP_9_64" origin/main
+                        --exec "tools/autorun-test.sh -p ${{ inputs.experiment }} -v IP_9_64" ${{ env.CI_BASE_BRANCH }}
       - name: Gather log files and crash dumps
         if: always()
         run: tools/gather-logfiles-and-crashdumps.sh