Test

vgrassia · Oct 14, 2024 · 695906a · 695906a
1 parent a41bfc5
commit 695906a
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/.github/workflows/repository-management.yml b/.github/workflows/repository-management.yml
@@ -186,6 +186,9 @@ jobs:
             git switch rc
             RC_COMMIT=$(git log --reverse --pretty=format:"%H" --max-count=1 Directory.Build.props)
             echo "rc_commit=$RC_COMMIT" >> $GITHUB_OUTPUT
+
+            RC_VERSION=$(xmllint -xpath "/Project/PropertyGroup/Version/text()" Directory.Build.props)
+            echo "rc_version=$RC_VERSION" >> $GITHUB_OUTPUT
           fi
       
       - name: Configure Git
@@ -197,6 +200,7 @@ jobs:
         env:
           MAIN_COMMIT: ${{ steps.get-commits.outputs.main_commit }}
           RC_COMMIT: ${{ steps.get-commits.outputs.rc_commit }}
+          RC_VERSION: ${{ steps.get-commits.outputs.rc_version }}
           CUT_BRANCH: ${{ inputs.branch_to_cut }}
         run: |
           # If we are cutting 'hotfix-rc':
@@ -207,20 +211,23 @@ jobs:
 
               # Chery-pick from 'rc' into 'hotfix-rc'
               git switch hotfix-rc
-              git cherry-pick --allow-empty --strategy-option=theirs -x $RC_COMMIT
-              git push -u origin hotfix-rc
+              HOTFIX_RC_VERSION=$(xmllint -xpath "/Project/PropertyGroup/Version/text()" Directory.Build.props)
+              if [[ "$HOTFIX_RC_VERSION" != "$RC_VERSION" ]]; then
+                git cherry-pick --strategy-option=theirs -x $RC_COMMIT
+                git push -u origin hotfix-rc
+              fi
 
               # Cherry-pick from 'main' into 'rc'
               git switch rc
-              git cherry-pick --allow-empty --strategy-option=theirs -x $MAIN_COMMIT
+              git cherry-pick --strategy-option=theirs -x $MAIN_COMMIT
               git push -u origin rc
 
             # If the 'rc' branch does not exist:
             else
 
               # Cherry-pick from 'main' into 'hotfix-rc'
               git switch hotfix-rc
-              git cherry-pick --allow-empty --strategy-option=theirs -x $MAIN_COMMIT
+              git cherry-pick --strategy-option=theirs -x $MAIN_COMMIT
               git push -u origin hotfix-rc
 
             fi
@@ -230,7 +237,7 @@ jobs:
 
             # Cherry-pick from 'main' into 'rc'
             git switch rc
-            git cherry-pick --allow-empty --strategy-option=theirs -x $MAIN_COMMIT
+            git cherry-pick --strategy-option=theirs -x $MAIN_COMMIT
             git push -u origin rc
 
           fi