Bulk backports to v4-main (3/7 edition)

.github/actions/setup/action.yml

@@ -70,7 +70,7 @@ runs:
         node-version-file: 'package.json'
         cache: 'pnpm'
 
-    - uses: oven-sh/setup-bun@v1
+    - uses: oven-sh/setup-bun@v2
       with:
         bun-version: latest
 
@@ -101,6 +101,11 @@ runs:
         sudo apt install libnss3-tools
         brew install mkcert
 
+    - name: 'Setup DBus for Chrome'
+      shell: bash
+      run: |
+        echo "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus" >> $GITHUB_ENV
+
     - name: Configure Parallel Builds
       if: ${{ inputs.parallel-build == 'true' }}
       shell: bash

.github/workflows/compat-tests.yml

@@ -54,18 +54,24 @@ jobs:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Run Tests
         run: pnpm test:vite
-  floating-dependencies:
-    timeout-minutes: 9
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-      - uses: ./.github/actions/setup
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Install dependencies w/o lockfile
-        run: pnpm install --no-lockfile
-      - name: Basic Tests
-        run: pnpm test
+  ###
+  # This Test No Longer Works Because pnpm install --no-lockfile
+  # returns exit code 1 whenever there is a lockfile present and
+  # changes are made to node_modules. This is probably a bug in pnpm.
+  ###
+  #
+  # floating-dependencies:
+  #   timeout-minutes: 9
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+  #     - uses: ./.github/actions/setup
+  #       with:
+  #         repo-token: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Install dependencies w/o lockfile
+  #       run: pnpm install --no-lockfile
+  #     - name: Basic Tests
+  #       run: pnpm test
   node-version-test:
     name: Use Node.js ${{ matrix.node-version }}
     timeout-minutes: 10

.github/workflows/main.yml

@@ -174,7 +174,11 @@ jobs:
         timeout-minutes: 12
         env:
           CI: true
-        run: pnpm test:try-one ${{ matrix.scenario }} -- ember test --test-port=0
+        run: |
+          cd tests/main;
+          pnpm exec ember try:one  ${{ matrix.scenario }} --skip-cleanup;
+          pnpm build:tests;
+          pnpm run test;
 
   releases:
     timeout-minutes: 12
@@ -201,4 +205,8 @@ jobs:
       - name: Basic tests with ${{ matrix.release }}
         env:
           CI: true
-        run: pnpm test:try-one ${{ matrix.release }} -- ember test --test-port=0
+        run: |
+          cd tests/main;
+          pnpm exec ember try:one ${{ matrix.release }} --skip-cleanup;
+          pnpm build:tests;
+          pnpm run test;

.github/workflows/perf-check.yml

@@ -53,12 +53,14 @@ jobs:
         run: |
           BROWSER_FLAGS=$(node ./scripts/perf-tracking/browser-flags.mjs)
           echo "BROWSER_FLAGS=$BROWSER_FLAGS" >> $GITHUB_OUTPUT
-      - uses: tracerbench/tracerbench-compare-action@35f3ab44b512fd2caffbe81adf875ab47272b5b5
+        #env:
+        #  DEBUG: true
+      - uses: tracerbench/tracerbench-compare-action@6b56fb774f78e4a85cf02396412b0164870cdab3
         with:
-          experiment-build-command: pnpm install && pnpm --filter performance-test-app exec ember build -e production --output-path dist-experiment --suppress-sizes
-          experiment-serve-command: pnpm --filter performance-test-app exec ember s --path dist-experiment --port 4201
-          control-build-command: pnpm install && pnpm --filter performance-test-app exec ember build -e production --output-path dist-control --suppress-sizes
-          control-serve-command: pnpm --filter performance-test-app exec ember s --path dist-control
+          experiment-build-command: pnpm --filter performance-test-app build --outDir dist-experiment
+          experiment-serve-command: pnpm --filter performance-test-app start dist-experiment -p 4201
+          control-build-command: pnpm --filter performance-test-app build --outDir dist-control
+          control-serve-command: pnpm --filter performance-test-app start dist-control -p 4200
           control-sha: origin/main
           sample-timeout: 60
           use-pnpm: true
@@ -70,6 +72,16 @@ jobs:
                 "experiment": "http://localhost:4201/basic-record-materialization",
                 "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,end-record-materialization"
               },
+              "complex-record-materialization": {
+                "control": "http://localhost:4200/complex-record-materialization",
+                "experiment": "http://localhost:4201/complex-record-materialization",
+                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,end-record-materialization"
+              },
+              "complex-record-materialization-with-relationship-materialization": {
+                "control": "http://localhost:4200/complex-record-materialization-with-relationship-materialization",
+                "experiment": "http://localhost:4201/complex-record-materialization-with-relationship-materialization",
+                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,start-field-access,start-relationship-access,end-relationship-access"
+              },
               "relationship-materialization-simple": {
                 "control": "http://localhost:4200/relationship-materialization-simple",
                 "experiment": "http://localhost:4201/relationship-materialization-simple",
@@ -78,7 +90,7 @@ jobs:
               "relationship-materialization-complex": {
                 "control": "http://localhost:4200/relationship-materialization-complex",
                 "experiment": "http://localhost:4201/relationship-materialization-complex",
-                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,start-relationship-materialization,end-relationship-materialization"
+                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,start-relationship-materialization,start-push-payload2,start-relationship-materialization2,end-relationship-materialization2"
               },
               "unload": {
                 "control": "http://localhost:4200/unload",
@@ -104,11 +116,30 @@ jobs:
                 "control": "http://localhost:4200/unused-relationships",
                 "experiment": "http://localhost:4201/unused-relationships",
                 "markers": "start-push-payload,end-push-payload"
+              },
+              "update-with-same-state": {
+                "control": "http://localhost:4200/update-with-same-state",
+                "experiment": "http://localhost:4201/update-with-same-state",
+                "markers": "start-data-generation,start-push-initial-payload,start-peek-records,start-record-materialization,start-relationship-materialization,start-local-removal,start-push-minus-one-payload,start-local-addition,start-push-plus-one-payload,end-push-plus-one-payload"
+              },
+              "update-with-same-state-m2m": {
+                "control": "http://localhost:4200/update-with-same-state-m2m",
+                "experiment": "http://localhost:4201/update-with-same-state-m2m",
+                "markers": "start-data-generation,start-push-initial-payload,start-peek-records,start-record-materialization,start-relationship-materialization,start-local-removal,start-push-minus-one-payload,start-local-addition,start-push-plus-one-payload,end-push-plus-one-payload"
               }
             }
           fidelity: 60
           upload-traces: true
           upload-results: true
+        # env:
+        #   DEBUG: '*,-babel*,-vite*,-rollup*,-ember*,-broccoli*,-pnpm*,-embroider*,-tree-sync*,-fs-tree-diff*'
+      # - name: Upload Assets
+      #   if: failure() || success()
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: built-files
+      #     path: 'tests/performance/dist-*'
+      #     retention-days: 1
       - name: Report TracerBench Results
         if: failure() || success()
         env:

.github/workflows/perf-over-release.yml

@@ -45,20 +45,22 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: 'package.json'
           cache: 'pnpm'
-      - uses: oven-sh/setup-bun@v1
+      - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
       - name: Get Browser Flags
         id: browser-flags
         run: |
           BROWSER_FLAGS=$(node ./scripts/perf-tracking/browser-flags.mjs)
           echo "BROWSER_FLAGS=$BROWSER_FLAGS" >> $GITHUB_OUTPUT
-      - uses: tracerbench/tracerbench-compare-action@35f3ab44b512fd2caffbe81adf875ab47272b5b5
+        # env:
+        #  DEBUG: true
+      - uses: tracerbench/tracerbench-compare-action@6b56fb774f78e4a85cf02396412b0164870cdab3
         with:
-          experiment-build-command: pnpm install && pnpm --filter performance-test-app exec ember build -e production --output-path dist-experiment --suppress-sizes
-          experiment-serve-command: pnpm --filter performance-test-app exec ember s --path dist-experiment --port 4201
-          control-build-command: pnpm install && pnpm --filter performance-test-app exec ember build -e production --output-path dist-control --suppress-sizes
-          control-serve-command: pnpm --filter performance-test-app exec ember s --path dist-control
+          experiment-build-command: pnpm --filter performance-test-app build --outDir dist-experiment
+          experiment-serve-command: pnpm --filter performance-test-app start dist-experiment -p 4201
+          control-build-command: pnpm --filter performance-test-app build --outDir dist-control
+          control-serve-command: pnpm --filter performance-test-app start dist-control -p 4200
           sample-timeout: 60
           use-pnpm: true
           browser-args: ${{ steps.browser-flags.outputs.BROWSER_FLAGS }}
@@ -69,6 +71,16 @@ jobs:
                 "experiment": "http://localhost:4201/basic-record-materialization",
                 "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,end-record-materialization"
               },
+              "complex-record-materialization": {
+                "control": "http://localhost:4200/complex-record-materialization",
+                "experiment": "http://localhost:4201/complex-record-materialization",
+                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,end-record-materialization"
+              },
+              "complex-record-materialization-with-relationship-materialization": {
+                "control": "http://localhost:4200/complex-record-materialization-with-relationship-materialization",
+                "experiment": "http://localhost:4201/complex-record-materialization-with-relationship-materialization",
+                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,start-field-access,start-relationship-access,end-relationship-access"
+              },
               "relationship-materialization-simple": {
                 "control": "http://localhost:4200/relationship-materialization-simple",
                 "experiment": "http://localhost:4201/relationship-materialization-simple",
@@ -77,7 +89,7 @@ jobs:
               "relationship-materialization-complex": {
                 "control": "http://localhost:4200/relationship-materialization-complex",
                 "experiment": "http://localhost:4201/relationship-materialization-complex",
-                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,start-relationship-materialization,end-relationship-materialization"
+                "markers": "start-data-generation,start-push-payload,start-peek-records,start-record-materialization,start-relationship-materialization,start-push-payload2,start-relationship-materialization2,end-relationship-materialization2"
               },
               "unload": {
                 "control": "http://localhost:4200/unload",
@@ -104,11 +116,25 @@ jobs:
                 "experiment": "http://localhost:4201/unused-relationships",
                 "markers": "start-push-payload,end-push-payload"
               }
+              "update-with-same-state-m2m": {
+                "control": "http://localhost:4200/update-with-same-state-m2m",
+                "experiment": "http://localhost:4201/update-with-same-state-m2m",
+                "markers": "start-data-generation,start-push-initial-payload,start-peek-records,start-record-materialization,start-relationship-materialization,start-local-removal,start-push-minus-one-payload,start-local-addition,start-push-plus-one-payload,end-push-plus-one-payload"
+              }
             }
           fidelity: 60
           control-sha: origin/release
           upload-traces: true
           upload-results: true
+        # env:
+        #   DEBUG: '*,-babel*,-vite*,-rollup*,-ember*,-broccoli*,-pnpm*,-embroider*,-tree-sync*,-fs-tree-diff*'
+      # - name: Upload Assets
+      #   if: failure() || success()
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: built-files
+      #     path: 'tests/performance/dist-*'
+      #     retention-days: 1
       - name: Report TracerBench Results
         if: failure() || success()
         env: