Merge branch 'main' into mk-bundling-no-npmrc

.github/workflows/test_chained_e2e.yml

@@ -1,6 +1,10 @@
 name: 'Test Chained E2E'
 
 on:
+  push:
+    branches:
+      - 'main'
+  merge_group:
   workflow_run:
     workflows: ['Trigger E2E']
     types: ['completed']
@@ -25,6 +29,7 @@ permissions:
 jobs:
   merge_queue_skipper:
     name: 'Merge Queue Skipper'
+    permissions: 'read-all'
     runs-on: 'gemini-cli-ubuntu-16-core'
     outputs:
       skip: '${{ steps.merge-queue-e2e-skipper.outputs.skip-check }}'
@@ -33,14 +38,16 @@ jobs:
         uses: 'cariad-tech/merge-queue-ci-skipper@1032489e59437862c90a08a2c92809c903883772' # ratchet:cariad-tech/merge-queue-ci-skipper@main
         with:
           secret: '${{ secrets.GITHUB_TOKEN }}'
+    continue-on-error: true
 
   download_repo_name:
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run'"
     outputs:
       repo_name: '${{ steps.output-repo-name.outputs.repo_name }}'
     steps:
       - name: 'Mock Repo Artifact'
-        if: "${{ github.event_name != 'workflow_run' }}"
+        if: "${{ github.event_name == 'workflow_dispatch' }}"
         env:
           REPO_NAME: '${{ github.event.inputs.repo_name }}'
         run: |
@@ -71,25 +78,49 @@ jobs:
             const repo_name = String(fs.readFileSync(path.join(temp, 'repo_name')));
             core.setOutput('repo_name', repo_name);
 
+  parse_run_context:
+    name: 'Parse run context'
+    runs-on: 'gemini-cli-ubuntu-16-core'
+    needs: 'download_repo_name'
+    if: 'always()'
+    outputs:
+      repository: '${{ steps.set_context.outputs.REPO }}'
+      sha: '${{ steps.set_context.outputs.SHA }}'
+    steps:
+      - id: 'set_context'
+        name: 'Set dynamic repository and SHA'
+        env:
+          REPO: '${{ needs.download_repo_name.outputs.repo_name || github.repository }}'
+          SHA: '${{ github.event.inputs.head_sha || github.event.workflow_run.head_sha || github.sha }}'
+        shell: 'bash'
+        run: |
+          echo "REPO=$REPO" >> "$GITHUB_OUTPUT"
+          echo "SHA=$SHA" >> "$GITHUB_OUTPUT"
+
   set_pending_status:
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run'"
     needs:
-      - 'download_repo_name'
+      - 'parse_run_context'
     steps:
       - name: 'Set pending status'
         uses: 'myrotvorets/set-commit-status-action@16037e056d73b2d3c88e37e393ff369047f70886' # ratchet:myrotvorets/set-commit-status-action@master
         if: 'always()'
         with:
           allowForks: 'true'
-          repo: '${{ needs.download_repo_name.outputs.repo_name }}'
-          sha: '${{ github.event.inputs.head_sha || github.event.workflow_run.head_sha }}'
+          repo: '${{ needs.parse_run_context.outputs.repository }}'
+          sha: '${{ needs.parse_run_context.outputs.sha }}'
           token: '${{ secrets.GITHUB_TOKEN }}'
           status: 'pending'
 
   e2e_linux:
     name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
-    needs: 'download_repo_name'
+    needs:
+      - 'merge_queue_skipper'
+      - 'parse_run_context'
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: |
+      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip == 'false')
     strategy:
       fail-fast: false
       matrix:
@@ -103,8 +134,8 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
         with:
-          ref: '${{ github.event.inputs.head_sha || github.event.workflow_run.head_sha }}'
-          repository: '${{ needs.download_repo_name.outputs.repo_name }}'
+          ref: '${{ needs.parse_run_context.outputs.sha }}'
+          repository: '${{ needs.parse_run_context.outputs.repository }}'
 
       - name: 'Set up Node.js ${{ matrix.node-version }}'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -136,14 +167,18 @@ jobs:
 
   e2e_mac:
     name: 'E2E Test (macOS)'
-    needs: 'download_repo_name'
+    needs:
+      - 'merge_queue_skipper'
+      - 'parse_run_context'
     runs-on: 'macos-latest'
+    if: |
+      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip == 'false')
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
         with:
-          ref: '${{ github.event.inputs.head_sha || github.event.workflow_run.head_sha }}'
-          repository: '${{ needs.download_repo_name.outputs.repo_name }}'
+          ref: '${{ needs.parse_run_context.outputs.sha }}'
+          repository: '${{ needs.parse_run_context.outputs.repository }}'
 
       - name: 'Set up Node.js 20.x'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -173,9 +208,9 @@ jobs:
     name: 'Slow E2E - Win'
     needs:
       - 'merge_queue_skipper'
-      - 'download_repo_name'
+      - 'parse_run_context'
     if: |
-      needs.merge_queue_skipper.outputs.skip == 'false'
+      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip == 'false')
     runs-on: 'gemini-cli-windows-16-core'
     continue-on-error: true
 
@@ -183,8 +218,8 @@ jobs:
       - name: 'Checkout'
         uses: 'actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955' # ratchet:actions/checkout@v5
         with:
-          ref: '${{ github.event.inputs.head_sha || github.event.workflow_run.head_sha }}'
-          repository: '${{ needs.download_repo_name.outputs.repo_name }}'
+          ref: '${{ needs.parse_run_context.outputs.sha }}'
+          repository: '${{ needs.parse_run_context.outputs.repository }}'
 
       - name: 'Set up Node.js 20.x'
         uses: 'actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020' # ratchet:actions-node@v4
@@ -233,7 +268,7 @@ jobs:
   e2e:
     name: 'E2E'
     if: |
-      always() && needs.merge_queue_skipper.outputs.skip == 'false'
+      always() && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip == 'false')
     needs:
       - 'e2e_linux'
       - 'e2e_mac'
@@ -251,8 +286,9 @@ jobs:
 
   set_workflow_status:
     runs-on: 'gemini-cli-ubuntu-16-core'
+    if: "github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_run'"
     needs:
-      - 'download_repo_name'
+      - 'parse_run_context'
       - 'e2e'
     steps:
       - name: 'Set workflow status'
@@ -260,7 +296,7 @@ jobs:
         if: 'always()'
         with:
           allowForks: 'true'
-          repo: '${{ needs.download_repo_name.outputs.repo_name }}'
-          sha: '${{ github.event.inputs.head_sha || github.event.workflow_run.head_sha }}'
+          repo: '${{ needs.parse_run_context.outputs.repository }}'
+          sha: '${{ needs.parse_run_context.outputs.sha }}'
           token: '${{ secrets.GITHUB_TOKEN }}'
           status: '${{ job.status }}'