Merge pull request #3106 from SalesforceCommerceCloud/update-agent-checkout-rebase-action

@W-19310725 : Update agent_checkout_rebase_action.yml

Author: nsethun123

.github/workflows/agent_checkout_rebase_action.yml

@@ -1,17 +1,20 @@
 # .github/workflows/rebase-express-payments.yml
 
-name: 'Auto Rebase adyenExpressPaymentsDreamForceTestAlertBranch'
+name: 'Auto Rebase adyenExpressPayments'
 
-# This action will trigger on every push to the develop branch.
+# This action will trigger on the creation of new preview release tags
 on:
   push:
-    branches:
-      - develop
+    tags:
+      - '*-preview'
   workflow_dispatch:
 
+permissions:
+  contents: write
+
 jobs:
   rebase:
-    name: Rebase adyenExpressPaymentsDreamForceTestAlertBranch on develop
+    name: Rebase adyenExpressPayments on preview release
     runs-on: ubuntu-latest
 
     steps:
@@ -34,9 +37,9 @@ jobs:
           git config --global user.name 'GitHub Actions'
           git config --global user.email 'actions@github.com'
 
-      # Step 4: Switch to the adyenExpressPaymentsDreamForceTestAlertBranch branch.
-      - name: Switch to adyenExpressPaymentsDreamForceTestAlertBranch branch
-        run: git checkout adyenExpressPaymentsDreamForceTestAlertBranch 
+      # Step 4: Switch to the adyenExpressPayments branch.
+      - name: Switch to adyenExpressPayments branch
+        run: git checkout adyenExpressPayments 
 
       # Step 5: Delete all package-lock.json files before the rebase.
       - name: Delete package-lock.json files
@@ -46,15 +49,19 @@ jobs:
           # The 'if' statement prevents an error if no lock files were found.
           if [[ -n $(git status -s) ]]; then
             git add .
-            git commit -m "chore: remove package-lock.json files before rebase"
+            git commit -m "chore: remove package-lock.json files before rebase and regenerating after"
           else
             echo "No package-lock.json files found to delete."
           fi
 
-      # Step 6: Attempt to rebase the branch. The job will fail if this step fails.
-      - name: Rebase adyenExpressPaymentsDreamForceTestAlertBranch with develop
+      # Step 6: Attempt to rebase the branch. If this step fails, we abort the rebase and 
+      # return the branch to its original state
+      - name: Rebase adyenExpressPayments with develop
         run: |
-          if ! git rebase origin/develop; then
+          TRIGGERING_TAG="${{ github.ref_name }}"
+          echo "🔄 Rebasing branch 'adyenExpressPayments' onto tag '$TRIGGERING_TAG'"
+          
+          if ! git rebase $TRIGGERING_TAG; then
             echo "Rebase failed due to conflicts. Aborting."
             git rebase --abort
             exit 1
@@ -63,11 +70,18 @@ jobs:
       # Step 7: Install dependencies after a successful rebase.
       # The '--yes' flag for lerna is crucial for non-interactive environments.
       - name: Install Dependencies
-        run: npx lerna clean --yes && npm i
+        run: |
+          if ! npx lerna clean --yes && npm i; then
+            echo "Generating package-lock files after rebase failed!"
+            exit 1
+          fi
 
       # Step 8: Push the changes only if all previous steps were successful.
       - name: Push Changes
-        run: git push origin adyenExpressPaymentsDreamForceTestAlertBranch --force-with-lease
+        run: |
+          git add .
+          git commit --amend --no-edit
+          git push origin adyenExpressPayments --force-with-lease
 
       # Step 9: This notification step will run if any of the above steps fail.
       - name: Notify on Failure
@@ -77,8 +91,7 @@ jobs:
           # The channel or user ID to send the notification to.
           channel-id: '${{ secrets.AGENT_CHECKOUT_ALERT_SLACK_CHANNEL_ID }}'
           # A custom message for the Slack notification.
-          slack-message: "🚨 Automatic rebase of `adyenExpressPaymentsDreamForceTestAlertBranch` failed. Manual intervention is required. Link to failed action: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          slack-message: "🚨 Automatic rebase of `adyenExpressPayments` failed. Manual intervention is required. Link to failed action: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
         env:
           # You must store your Slack Bot Token as a secret in your repository settings.
           SLACK_BOT_TOKEN: '${{ secrets.AGENT_CHECKOUT_SLACK_BOT_TOKEN }}'
-          # Forcing a re-index