Evergreen: always merge main first, then fix CI as separate pushes

Agent-Logs-Url: https://github.com/githubnext/tsessebe/sessions/0fc6272c-8e4d-4a5b-b011-f932c2eb0c3a

Co-authored-by: mrjf <180956+mrjf@users.noreply.github.com>

Author: Copilot

.github/aw/actions-lock.json

@@ -9,11 +9,6 @@
       "repo": "actions/github-script",
       "version": "v9",
       "sha": "3a2844b7e9c422d3c10d287c895573f7108da1b3"
-    },
-    "github/gh-aw-actions/setup@v0.71.2": {
-      "repo": "github/gh-aw-actions/setup",
-      "version": "v0.71.2",
-      "sha": "ab8940d1df237fc4fae4ab8091e7ba66ada55a55"
     }
   }
 }