Merge branch 'main' into ganders/CC-6219

Author: gpanders

.bazeliskrc

@@ -10,9 +10,6 @@ build --test_size_filters=-enormous
 # corresponds to small,medium,large,enormous tests (medium is default)
 build --test_timeout=3,15,60,240
 
-# Use GitHub mirror for BCR to work around bcr.bazel.build outages
-common --registry=https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/main/
-
 # We're only using bzlmod in a nominal capacity so far
 common --enable_workspace
 

.bazelrc

@@ -34,6 +34,8 @@ runs:
       if: runner.os == 'Windows'
       # Set a custom output root directory to avoid long file name issues.
       run: |
+        # Enable Developer Mode to allow Bazel to create real symlinks
+        reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\AppModelUnlock" /t REG_DWORD /f /v "AllowDevelopmentWithoutDevLicense" /d "1"
         git config --global core.symlinks true
         git config --show-scope --show-origin core.symlinks
         git config --system core.longpaths true

.github/actions/setup-runner/action.yml

@@ -5,7 +5,7 @@ on:
       image:
         type: string
         required: false
-        default: 'ubuntu-22.04'
+        default: 'ubuntu-22.04-16core'
       os_name:
         type: string
         required: false
@@ -144,15 +144,13 @@ jobs:
         run: |
           bazel build --config=parse_headers --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev --config=ci ${{ inputs.extra_bazel_args }} //src/workerd/util
       - name: Upload test logs
-        if: inputs.upload_test_logs
+        if: always() && inputs.upload_test_logs
         uses: actions/upload-artifact@v4
         with:
           name: test-logs-${{ inputs.os_name }}-${{ inputs.arch_name }}${{ inputs.suffix }}.zip
           path: bazel-testlogs/**/test.xml
       - name: Report disk usage (in MB)
-        # This step takes a few seconds on Mac and Linux but takes 16 minutes on Windows for
-        # some reason. It doesn't seem important enough to wait for 16 minutes on every build.
-        if: runner.os != 'Windows'
+        if: always() && runner.os != 'Windows'
         shell: bash
         run: |
           BAZEL_OUTPUT_BASE=$(bazel info output_base)
@@ -163,6 +161,26 @@ jobs:
           du -ms -t 1 $BAZEL_OUTPUT_BASE
           echo "Workspace usage statistics"
           du -ms -t 1 $GITHUB_WORKSPACE
+      - name: Report disk usage (in MB)
+        if: always() && runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          function Get-SizeMB($path) {
+            if (Test-Path $path) {
+              $size = (Get-ChildItem -Path $path -Recurse -Force -ErrorAction SilentlyContinue |
+                       Measure-Object -Property Length -Sum -ErrorAction SilentlyContinue).Sum
+              [math]::Round($size / 1MB)
+            } else { 0 }
+          }
+          $outputBase = bazel info output_base 2>$null
+          $repoCache = bazel info repository_cache 2>$null
+          echo "Bazel cache usage statistics"
+          echo "$(Get-SizeMB $env:USERPROFILE\bazel-disk-cache)`t$env:USERPROFILE\bazel-disk-cache"
+          echo "$(Get-SizeMB $repoCache)`t$repoCache"
+          echo "Bazel output usage statistics"
+          echo "$(Get-SizeMB $outputBase)`t$outputBase"
+          echo "Workspace usage statistics"
+          echo "$(Get-SizeMB $env:GITHUB_WORKSPACE)`t$env:GITHUB_WORKSPACE"
 
       - name: Upload binary
         if: inputs.upload_binary
@@ -172,7 +190,7 @@ jobs:
           path: bazel-bin/src/workerd/server/workerd${{ runner.os == 'Windows' && '.exe' || '' }}
           if-no-files-found: error
       - name: Upload build statistics
-        if: inputs.run_tests
+        if: always() && inputs.run_tests
         uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.os_name }}${{ inputs.arch_name }}${{ inputs.suffix }}-bazel-profile
@@ -196,5 +214,6 @@ jobs:
           fi
 
       - name: Bazel shutdown
+        if: always()
         # Check that there are no .bazelrc issues that prevent shutdown.
         run: bazel shutdown

.github/workflows/_bazel.yml

@@ -24,7 +24,7 @@ permissions:
 jobs:
   benchmarks:
     name: Run benchmarks
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-16core
     env:
       BAZEL_ARGS: --config=benchmark --@google_benchmark//:codspeed_mode=instrumentation --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev
     steps:

.github/workflows/codspeed.yml

@@ -77,31 +77,31 @@ jobs:
         include:
           - title: linux
             os-name: Linux
-            image: ubuntu-22.04
+            image: ubuntu-22.04-16core
             bazel-config: release_linux
             target-arch: X64
           - title: linux-arm64
             os-name: Linux
-            image: ubuntu-22.04-arm
+            image: ubuntu-22.04-arm-16core
             bazel-config: release_linux
             target-arch: ARM64
           # Based on runner availability, we build both Apple Silicon and (cross-compiled) x86
-          # release binaries on the macos-15 runner.
+          # release binaries on the macos-15-xlarge runner.
           - title: macOS-x64
             os-name: macOS
-            # This configuration is used for cross-compiling – macos-15 is Apple Silicon-based but
+            # This configuration is used for cross-compiling – macos-15-xlarge is Apple Silicon-based but
             # we use it to compile the x64 release.
-            image: macos-15
+            image: macos-15-xlarge
             bazel-config: release_macos_cross_x86_64
             target-arch: X64
           - title: macOS-arm64
             os-name: macOS
-            image: macos-15
+            image: macos-15-xlarge
             bazel-config: release_macos
             target-arch: ARM64
           - title: windows
             os-name: Windows
-            image: windows-2025
+            image: windows-2025-16core
             bazel-config: release_windows
             target-arch: X64
     name: build (${{ matrix.title }})
@@ -237,7 +237,7 @@ jobs:
   publish-wrapper:
     name: Publish `workerd` to NPM
     needs: [version, upload-artifacts]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-16core
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
@@ -294,7 +294,7 @@ jobs:
       - run: cd npm/workerd && npm publish --access public --tag ${{ startsWith(needs.version.outputs.version, '0') && 'beta' || 'latest'}}
 
   build-and-publish-types:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-16core
     needs: [version, upload-artifacts]
     steps:
       - uses: actions/checkout@v4

.github/workflows/release.yml

@@ -33,10 +33,10 @@ jobs:
       matrix:
         os:
           [
-            { name: linux, arch: X64, image: ubuntu-22.04 },
-            { name: linux-arm, arch: ARM64, image: ubuntu-22.04-arm },
-            { name: macOS, arch: ARM64, image: macos-15 },
-            { name: windows, arch: X64, image: windows-2025 },
+            { name: linux, arch: X64, image: ubuntu-22.04-16core },
+            { name: linux-arm, arch: ARM64, image: ubuntu-22.04-arm-16core },
+            { name: macOS, arch: ARM64, image: macos-15-xlarge, use_lld: true },
+            { name: windows, arch: X64, image: windows-2025-16core },
           ]
         config: [
             # Default build: no suffix or additional bazel arguments
@@ -46,7 +46,7 @@ jobs:
           ]
         include:
           # Add an Address Sanitizer (ASAN) build on Linux for additional checking.
-          - os: { name: linux, arch: X64, image: ubuntu-22.04 }
+          - os: { name: linux, arch: X64, image: ubuntu-22.04-16core }
             config: { suffix: -asan }
           # TODO (later): The custom Windows-debug configuration consistently runs out of disk
           # space on CI, disable it for now. Once https://github.com/bazelbuild/bazel/issues/21615
@@ -55,17 +55,17 @@ jobs:
           # - os:     { name : windows, image : windows-2025 }
           #   config: { suffix: -debug, bazel-args: --config=windows_dbg }
         exclude:
-          - os: { name: windows, arch: X64, image: windows-2025 }
+          - os: { name: windows, arch: X64, image: windows-2025-16core }
             config: { suffix: -debug }
           # due to resource constraints, exclude the macOS and x64 Linux debug runners for now.
           # linux-asan and arm64 linux-debug should provide sufficient coverage for building in the
           # debug configuration.
-          - os: { name: macOS, arch: ARM64 ,image: macos-15 }
+          - os: { name: macOS, arch: ARM64 ,image: macos-15-xlarge }
             config: { suffix: -debug }
-          - os: { name: linux, arch: X64, image: ubuntu-22.04 }
+          - os: { name: linux, arch: X64, image: ubuntu-22.04-16core }
             config: { suffix: -debug }
             # linux release is handled by separate test-linux job
-          - os: { name: linux, arch: X64, image: ubuntu-22.04 }
+          - os: { name: linux, arch: X64, image: ubuntu-22.04-16core }
             config: { suffix: '' }
       fail-fast: false
     name: test (${{ matrix.os.name }}, ${{ matrix.os.image}}${{matrix.config.suffix != '' && format(', {0}', matrix.config.suffix) || ''}})
@@ -76,6 +76,7 @@ jobs:
       arch_name: ${{ matrix.os.arch }}
       suffix: ${{ matrix.config.suffix }}
       extra_bazel_args: '--config=ci-test --config=ci-${{matrix.os.name}}${{matrix.config.suffix}}'
+      macos_use_lld: ${{ matrix.os.use_lld || false }}
     secrets:
       BAZEL_CACHE_KEY: ${{ secrets.BAZEL_CACHE_KEY }}
       WORKERS_MIRROR_URL: ${{ secrets.WORKERS_MIRROR_URL }}
@@ -84,7 +85,7 @@ jobs:
   test-linux:
     uses: ./.github/workflows/_bazel.yml
     with:
-      image: ubuntu-22.04
+      image: ubuntu-22.04-16core
       os_name: linux
       arch_name: 'X64'
       suffix: ''
@@ -107,7 +108,7 @@ jobs:
       WORKERS_MIRROR_URL: ${{ secrets.WORKERS_MIRROR_URL }}
 
   check-snapshot:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-16core
     steps:
       - uses: actions/checkout@v4
         with:
@@ -169,7 +170,7 @@ jobs:
   workers-sdk-test:
     needs: [test-linux, check-snapshot]
     name: Run workers-sdk tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-22.04-16core
     steps:
       - name: Checkout workers-sdk
         uses: actions/checkout@v4
@@ -244,6 +245,6 @@ jobs:
     needs: [test-linux]
     uses: ./.github/workflows/_wpt.yml
     with:
-      image: 'ubuntu-22.04'
+      image: 'ubuntu-22.04-16core'
       logs_artifact: 'test-logs-linux-X64.zip'
       report_artifact: 'wpt-report-linux-X64.json'

.github/workflows/test.yml

@@ -103,7 +103,7 @@ The compiled binary will be located at `bazel-bin/src/workerd/server/workerd`.
 If you run a Bazel build before you've installed some dependencies (like clang or libc++), and then you install the dependencies, you must resync locally cached toolchains, or clean Bazel's cache, otherwise you might get strange errors:
 
 ```sh
-bazel sync --configure
+bazel fetch --configure --force
 ```
 
 If that fails, you can try:

README.md

@@ -1,5 +1 @@
 workspace(name = "workerd")
-
-load("//build/deps:dep_pyodide.bzl", "dep_pyodide")
-
-dep_pyodide()

WORKSPACE

@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 cc_library(
     name = "nbytes",
     srcs = ["src/nbytes.cpp"],