Merge branch 'master' into phoebe/procedure/rust-sdk

Author: gefjon

.github/workflows/ci.yml

@@ -14,10 +14,8 @@ on:
 name: CI
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.event.inputs.pr_number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   docker_smoketests:

.github/workflows/csharp-test.yml

@@ -7,10 +7,8 @@ on:
   pull_request:
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   unity-testsuite:

.github/workflows/internal-tests.yml

@@ -10,22 +10,15 @@ permissions:
   contents: read
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   run-tests:
     # Skip if this is an external contribution. GitHub secrets will be empty, so the step would fail anyway.
     if: ${{ github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
     steps:
-      - name: Print current ref and sha
-        run: |
-          echo "github.ref=${{ github.ref }}"
-          echo "github.sha=${{ github.sha }}"
-
       - name: Trigger and wait for Internal Tests
         uses: actions/github-script@v7
         with:
@@ -35,9 +28,15 @@ jobs:
             const targetRepo = 'SpacetimeDBPrivate';
             const workflowId = 'internal-tests.yml';
             const targetRef = 'master';
-            const publicRef = context.sha;
+            // Use the ref for pull requests because the head sha is brittle (github does some extra dance where it merges in master).
+            const publicRef = (context.eventName === 'pull_request') ? context.payload.pull_request.head.ref : context.sha;
             const preDispatch = new Date().toISOString();
 
+            console.log("context.eventName =", context.eventName);
+            console.log("context.ref =", context.ref);
+            console.log("context.sha =", context.sha);
+            console.log("Dispatch workflow with publicRef =", publicRef);
+
             // Dispatch the workflow in the target repository
             await github.rest.actions.createWorkflowDispatch({
               owner: targetOwner,

.github/workflows/typescript-test.yml

@@ -8,10 +8,8 @@ on:
   merge_group:
 
 concurrency:
-  # When a PR number isn't available, the event won't be a `pull_request` event so it won't matter.
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  # Only cancel when the event is a pull_request
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || format('sha-%s', github.sha) }}
+  cancel-in-progress: true
 
 jobs:
   build-and-test: