Update workflow to run automatically on branch pushes and verify results

Co-authored-by: kasperpeulen <1035299+kasperpeulen@users.noreply.github.com>

Author: Copilot

.github/workflows/reset-upstream-main.yml

@@ -1,6 +1,9 @@
 name: 🔄 Reset upstream-main Branch
 
 on:
+  push:
+    branches:
+      - copilot/reset-upstream-main-branch
   workflow_dispatch:
     inputs:
       target_commit:
@@ -14,10 +17,17 @@ on:
 permissions:
   contents: write
 
+env:
+  DEFAULT_TARGET_COMMIT: 'bac7bd445d5d4c7c602399a842518f40ec591f2d'
+
 jobs:
   reset-branch:
     name: Reset upstream-main to target commit
     runs-on: ubuntu-22.04
+    # Only run on push events, or on workflow_dispatch with confirmation
+    if: |
+      github.event_name == 'push' || 
+      (github.event_name == 'workflow_dispatch' && github.event.inputs.confirm == 'confirm')
     
     steps:
       - name: ⬇️ Checkout repo
@@ -26,17 +36,20 @@ jobs:
           fetch-depth: 0  # Fetch all history for all branches
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: 🔐 Validate confirmation
+      - name: 🎯 Set target commit
+        id: set-target
         run: |
-          if [ "${{ github.event.inputs.confirm }}" != "confirm" ]; then
-            echo "❌ Confirmation not provided. Please type 'confirm' to proceed."
-            exit 1
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            TARGET_COMMIT="${{ github.event.inputs.target_commit }}"
+          else
+            TARGET_COMMIT="${{ env.DEFAULT_TARGET_COMMIT }}"
           fi
-          echo "✅ Confirmation received"
+          echo "target_commit=$TARGET_COMMIT" >> $GITHUB_OUTPUT
+          echo "Using target commit: $TARGET_COMMIT"
       
       - name: 🔍 Verify target commit exists
         run: |
-          TARGET_COMMIT="${{ github.event.inputs.target_commit }}"
+          TARGET_COMMIT="${{ steps.set-target.outputs.target_commit }}"
           if ! git cat-file -e "$TARGET_COMMIT^{commit}"; then
             echo "❌ Target commit $TARGET_COMMIT does not exist"
             exit 1
@@ -46,13 +59,13 @@ jobs:
       
       - name: 📊 Show commits to be removed
         run: |
-          TARGET_COMMIT="${{ github.event.inputs.target_commit }}"
+          TARGET_COMMIT="${{ steps.set-target.outputs.target_commit }}"
           echo "The following commits will be REMOVED from upstream-main:"
           git log --oneline "$TARGET_COMMIT..origin/upstream-main" || echo "No commits to remove (branch already at or before target)"
       
       - name: 🔄 Reset upstream-main branch
         run: |
-          TARGET_COMMIT="${{ github.event.inputs.target_commit }}"
+          TARGET_COMMIT="${{ steps.set-target.outputs.target_commit }}"
           
           # Configure git
           git config user.name "github-actions[bot]"
@@ -76,7 +89,7 @@ jobs:
       
       - name: ✅ Verify reset
         run: |
-          TARGET_COMMIT="${{ github.event.inputs.target_commit }}"
+          TARGET_COMMIT="${{ steps.set-target.outputs.target_commit }}"
           
           # Verify the remote branch
           REMOTE_SHA=$(git ls-remote origin upstream-main | awk '{print $1}')
@@ -91,3 +104,63 @@ jobs:
           echo ""
           echo "Latest commits on upstream-main:"
           git log --oneline upstream-main -5
+  
+  verify-result:
+    name: Verify upstream-main reset result
+    runs-on: ubuntu-22.04
+    needs: reset-branch
+    if: always()
+    
+    steps:
+      - name: ⬇️ Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      
+      - name: 🔍 Check reset result
+        run: |
+          TARGET_COMMIT="${{ env.DEFAULT_TARGET_COMMIT }}"
+          
+          # Fetch the latest state
+          git fetch origin upstream-main
+          
+          # Get the current commit on upstream-main
+          CURRENT_SHA=$(git ls-remote origin upstream-main | awk '{print $1}')
+          
+          echo "Target commit: $TARGET_COMMIT"
+          echo "Current upstream-main: $CURRENT_SHA"
+          echo ""
+          
+          if [ "$CURRENT_SHA" = "$TARGET_COMMIT" ]; then
+            echo "✅ VERIFICATION SUCCESS"
+            echo "The upstream-main branch is correctly reset to $TARGET_COMMIT"
+            echo ""
+            echo "Commits on upstream-main:"
+            git log --oneline "$CURRENT_SHA" -5
+            exit 0
+          else
+            echo "❌ VERIFICATION FAILED"
+            echo "The upstream-main branch is at $CURRENT_SHA but should be at $TARGET_COMMIT"
+            echo ""
+            echo "Difference:"
+            git log --oneline "$TARGET_COMMIT..$CURRENT_SHA" 2>/dev/null || echo "Target is ahead of current"
+            exit 1
+          fi
+      
+      - name: 📋 Job summary
+        if: always()
+        run: |
+          TARGET_COMMIT="${{ env.DEFAULT_TARGET_COMMIT }}"
+          CURRENT_SHA=$(git ls-remote origin upstream-main | awk '{print $1}')
+          
+          echo "## Reset Verification Results" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "- **Target commit**: \`$TARGET_COMMIT\`" >> $GITHUB_STEP_SUMMARY
+          echo "- **Current commit**: \`$CURRENT_SHA\`" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          
+          if [ "$CURRENT_SHA" = "$TARGET_COMMIT" ]; then
+            echo "✅ **Status**: Reset successful" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "❌ **Status**: Reset failed or incomplete" >> $GITHUB_STEP_SUMMARY
+          fi