Merge branch 'master' into tyler/clear-on-conflict

Author: jdetter

.github/workflows/ci.yml

@@ -22,11 +22,19 @@ jobs:
     name: Smoketests
     strategy:
       matrix:
+        runner: [spacetimedb-new-runner, windows-latest]
         include:
-          - { runner: spacetimedb-runner, smoketest_args: --docker }
-          - { runner: windows-latest, smoketest_args: --no-build-cli }
-        runner: [ spacetimedb-runner, windows-latest ]
+          - runner: spacetimedb-new-runner
+            smoketest_args: --docker
+            container:
+              image: localhost:5000/spacetimedb-ci:latest
+              options: --privileged
+          - runner: windows-latest
+            smoketest_args: --no-build-cli
+            container: null
     runs-on: ${{ matrix.runner }}
+    container: ${{ matrix.container }}
+    
     steps:
       - name: Find Git ref
         env:
@@ -63,6 +71,10 @@ jobs:
         if: runner.os == 'Windows'
         run: choco install psql -y --no-progress
         shell: powershell
+      - name: Start Docker daemon
+        if: runner.os == 'Linux'
+        run: /usr/local/bin/start-docker.sh
+
       - name: Build and start database (Linux)
         if: runner.os == 'Linux'
         run: docker compose up -d
@@ -93,7 +105,11 @@ jobs:
 
   test:
     name: Test Suite
-    runs-on: spacetimedb-runner
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: >-
+        --privileged
     steps:
       - name: Find Git ref
         env:
@@ -140,8 +156,9 @@ jobs:
         #Note: Unreal tests will be run separately
         run: cargo test --all -- --skip unreal
 
+        # The fallocate tests have been flakely when running in parallel
       - name: Run fallocate tests
-        run: cargo test -p spacetimedb-durability --features fallocate
+        run: cargo test -p spacetimedb-durability --features fallocate -- --test-threads=1
 
       - name: Check that the test outputs are up-to-date
         run: bash tools/check-diff.sh
@@ -157,7 +174,11 @@ jobs:
 
   lints:
     name: Lints
-    runs-on: spacetimedb-runner
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: >-
+        --privileged
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -196,7 +217,11 @@ jobs:
 
   wasm_bindings:
     name: Build and test wasm bindings
-    runs-on: spacetimedb-runner
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: >-
+        --privileged
     steps:
       - uses: actions/checkout@v3
 
@@ -221,7 +246,11 @@ jobs:
 
   publish_checks:
     name: Check that packages are publishable
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: >-
+        --privileged
     permissions: read-all
     steps:
       - uses: actions/checkout@v3
@@ -231,11 +260,12 @@ jobs:
           venv/bin/pip3 install argparse toml
       - name: Run checks
         run: |
+          set -ueo pipefail
           FAILED=0
-          # This definition of ROOTS and invocation of find-publish-list.py is copied from publish-crates.sh
-          ROOTS=(bindings sdk cli standalone)
-          for crate in $(venv/bin/python3 tools/find-publish-list.py --recursive --quiet "${ROOTS[@]}"); do
-            if ! venv/bin/python3 tools/crate-publish-checks.py "crates/$crate"; then
+          ROOTS=(spacetimedb spacetimedb-sdk)
+          CRATES=$(venv/bin/python3 tools/find-publish-list.py --recursive --directories --quiet "${ROOTS[@]}")
+          for crate_dir in $CRATES; do
+            if ! venv/bin/python3 tools/crate-publish-checks.py "${crate_dir}"; then
               FAILED=$(( $FAILED + 1 ))
             fi
           done
@@ -288,7 +318,7 @@ jobs:
     name: Unreal Engine Tests
     # This can't go on e.g. ubuntu-latest because that runner runs out of disk space. ChatGPT suggested that the general solution tends to be to use
     # a custom runner.
-    runs-on: spacetimedb-runner
+    runs-on: spacetimedb-new-runner
     # 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 }}
     container:
@@ -367,13 +397,17 @@ jobs:
 
               cd "$GITHUB_WORKSPACE/sdks/unreal"
               cargo --version
-              cargo test
+              cargo test -- --test-threads=1
             '
 
   cli_docs:
     name: Check CLI docs
     permissions: read-all
-    runs-on: ubuntu-latest
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: >-
+        --privileged
     steps:
       - name: Find Git ref
         env:

.github/workflows/csharp-test.yml

@@ -12,7 +12,12 @@ concurrency:
 
 jobs:
   unity-testsuite:
-    runs-on: spacetimedb-runner
+    runs-on: spacetimedb-new-runner
+    container:
+      image: localhost:5000/spacetimedb-ci:latest
+      options: >-
+        --privileged
+        --cgroupns=host
     # Cancel any previous testsuites running on the same PR and/or ref.
     concurrency:
       group: unity-test-${{ github.event.pull_request.number || github.ref }}
@@ -81,7 +86,7 @@ jobs:
           cargo install --force --path crates/cli --locked --message-format=short
           cargo install --force --path crates/standalone --locked --message-format=short
           # Add a handy alias using the old binary name, so that we don't have to rewrite all scripts (incl. in submodules).
-          ln -sf $HOME/.cargo/bin/spacetimedb-cli $HOME/.cargo/bin/spacetime
+          ln -sf $CARGO_HOME/bin/spacetimedb-cli $CARGO_HOME/bin/spacetime
         env:
           # Share the target directory with our local project to avoid rebuilding same SpacetimeDB crates twice.
           CARGO_TARGET_DIR: demo/Blackholio/server-rust/target
@@ -157,6 +162,9 @@ jobs:
           key: Unity-${{ github.head_ref }}
           restore-keys: Unity-
 
+        # We need this to support "Docker in Docker"
+      - name: Start Docker daemon
+        run: /usr/local/bin/start-docker.sh
       - name: Run Unity tests
         uses: game-ci/unity-test-runner@v4
         with:

.github/workflows/discord-posts.yml

@@ -10,7 +10,6 @@ jobs:
     if: github.event.pull_request.merged == true &&
       github.event.pull_request.base.ref == 'master'
     env:
-      CHECK_NAME: Internal Tests
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Set up GitHub CLI
@@ -21,34 +20,51 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y gh
 
-      - name: Fetch Check Run Results
-        run: |
-          RESULT="$(gh pr checks "${{github.event.pull_request.html_url}}" --json 'workflow,state' |
-            jq -r ".[] | select(.workflow==\"${CHECK_NAME}\").state")"
-
-          if [ -z "$RESULT" ]; then
-            RESULT="The check did not run!"
-          fi
-
-          echo "CHECK_RESULT=${RESULT}" >> $GITHUB_ENV
-
       - name: Send Discord notification
         env:
           DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
           PR_TITLE: ${{ github.event.pull_request.title }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           PR_URL: ${{ github.event.pull_request.html_url }}
-          CHECK_RESULT: ${{ env.CHECK_RESULT }}
           MENTION_ON_FAILURE: ${{ secrets.DEV_OPS_ROLE_ID }}
+          DISCORD_USER_MAP: ${{ secrets.DISCORD_USER_MAP }}
         run: |
           message="PR merged: [(#${PR_NUMBER}) ${PR_TITLE}](<${PR_URL}>)"
-          message+=$'\n'
-          message+="${CHECK_NAME} result: ${CHECK_RESULT}"
           # Note that anything besides success is treated as a failure (e.g. if the check did not run at all, or if it is still pending).
-          if [[ "${CHECK_RESULT}" != "SUCCESS" ]]; then
+          FAILED_CHECKS="$(
+            gh pr checks "${{github.event.pull_request.html_url}}" \
+              --json 'workflow,state,name' |
+              jq '.[]
+                | select(.workflow != "Discord notifications")
+                | select(.state != "SUCCESS" and .state != "NEUTRAL")
+              ' |
+              jq -r '"\(.workflow) / \(.name): \(.state)"'
+          )"
+
+          # Lookup PR author's Discord ID from the provided JSON map (if any)
+          author_discord_id="$(
+            jq -r \
+              --arg u "${{ github.event.pull_request.user.login }}" \
+              '.[$u] // empty' \
+              <<<"${DISCORD_USER_MAP}"
+          )"
+          if [ -z "${author_discord_id}" ]; then
+            echo "Warning: PR author not found not found in USER_LOOKUP_JSON"
+          fi
+
+          message+=$'\n'
+          if [[ -z "${FAILED_CHECKS}" ]]; then
+            message+='All checks passed.'
+          else
+            message+="${FAILED_CHECKS}"
+            message+=$'\n'
             # This uses special Discord syntax for pinging a particular role.
             # Note the '&' - this is the difference between pinging a *role* and pinging a *person*.
-            message+=" (cc <@&${MENTION_ON_FAILURE}>)"
+            message+=" (cc <@&${MENTION_ON_FAILURE}>"
+            if [[ -n "${author_discord_id}" ]]; then
+              message+=" <@${author_discord_id}>"
+            fi
+            message+=")"
           fi
           # Use `jq` to construct the json data blob in the format required by the webhook.
           data="$(jq --null-input --arg msg "$message" '.content=$msg')"

.github/workflows/internal-tests.yml

@@ -18,16 +18,20 @@ jobs:
     # 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
+    env:
+      TARGET_OWNER: clockworklabs
+      TARGET_REPO: SpacetimeDBPrivate
     steps:
-      - name: Trigger and wait for Internal Tests
+      - id: dispatch
+        name: Trigger tests
         uses: actions/github-script@v7
         with:
           github-token: ${{ secrets.SPACETIMEDB_PRIVATE_TOKEN }}
           script: |
-            const targetOwner = 'clockworklabs';
-            const targetRepo = 'SpacetimeDBPrivate';
-            const workflowId = 'internal-tests.yml';
+            const workflowId = 'ci.yml';
             const targetRef = 'master';
+            const targetOwner = process.env.TARGET_OWNER;
+            const targetRepo = process.env.TARGET_REPO;
             // 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();
@@ -48,12 +52,10 @@ jobs:
 
             const sleep = (ms) => new Promise(r => setTimeout(r, ms));
 
-            // Wait for workflow to be kicked off
-            await sleep(30000);
-
             // Find the dispatched run by name
             let runId = null;
             for (let attempt = 0; attempt < 20 && !runId; attempt++) { // up to ~10 minutes to locate the run
+              await sleep(5000);
               const runsResp = await github.rest.actions.listWorkflowRuns({
                 owner: targetOwner,
                 repo: targetRepo,
@@ -63,7 +65,7 @@ jobs:
                 per_page: 50,
               });
 
-              const expectedName = `Internal Tests [${publicRef}]`;
+              const expectedName = `CI [public_ref=${publicRef}]`;
               const candidates = runsResp.data.workflow_runs
                 .filter(r => r.name === expectedName && new Date(r.created_at) >= new Date(preDispatch))
                 .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
@@ -72,7 +74,6 @@ jobs:
                 runId = candidates[0].id;
                 break;
               }
-              await sleep(30000);
             }
 
             if (!runId) {
@@ -83,9 +84,23 @@ jobs:
             // Provide direct link and context prior to waiting
             const runUrl = `https://github.com/${targetOwner}/${targetRepo}/actions/runs/${runId}`;
             core.info(`View run: ${runUrl}`);
-            core.info('Waiting for workflow result...');
 
-            // Wait for completion
+            core.setOutput('run_id', String(runId));
+            core.setOutput('run_url', runUrl);
+
+      - name: Wait for Internal Tests to complete
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.SPACETIMEDB_PRIVATE_TOKEN }}
+          script: |
+            const targetOwner = process.env.TARGET_OWNER;
+            const targetRepo = process.env.TARGET_REPO;
+            const runId = Number(`${{ steps.dispatch.outputs.run_id }}`);
+            const runUrl = `${{ steps.dispatch.outputs.run_url }}`;
+            const sleep = (ms) => new Promise(r => setTimeout(r, ms));
+
+            core.info(`Waiting for workflow result... ${runUrl}`);
+
             let conclusion = null;
             for (let attempt = 0; attempt < 240; attempt++) { // up to ~2 hours
               const runResp = await github.rest.actions.getWorkflowRun({
@@ -110,3 +125,24 @@ jobs:
             if (conclusion !== 'success') {
               core.setFailed(`Private workflow failed with conclusion: ${conclusion}`);
             }
+
+      - name: Cancel invoked run if workflow cancelled
+        if: ${{ cancelled() }}
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.SPACETIMEDB_PRIVATE_TOKEN }}
+          script: |
+            const targetOwner = process.env.TARGET_OWNER;
+            const targetRepo = process.env.TARGET_REPO;
+            const runId = Number(`${{ steps.dispatch.outputs.run_id }}`);
+            if (!runId) {
+              core.warning('No run_id available to cancel.');
+              return;
+            }
+            core.info(`Cancelling private workflow run ${runId} in ${targetOwner}/${targetRepo}...`);
+            await github.rest.actions.cancelWorkflowRun({
+              owner: targetOwner,
+              repo: targetRepo,
+              run_id: runId,
+            });
+            core.info('Cancellation requested.');