Skip to content

CI: web, Linux and Android in one x86_64 job; BuildBuddy's remote cache; a Waydroid probe - #229

Merged
logan-shire-agent[bot] merged 7 commits into
mainfrom
ci-linux-android-x86
Nov 16, 2026
Merged

logan-shire-agent[bot] merged 7 commits into
mainfrom
ci-linux-android-x86

Conversation

@logan-shire-agent

@logan-shire-agent logan-shire-agent Bot commented Nov 16, 2026 •

Copy link
Copy Markdown
Contributor

Three changes to CI. The workflow part (.github/workflows/build.yml) can't be pushed from this branch: the account that opened it has no workflows permission. It's the diff at the end of this body. Someone who can push workflows needs to commit it to this branch before merging. Everything else is on the branch.

1. The web, Linux and Android in one x86_64 job

Until now, the web and Linux targets built on ubuntu-24.04-arm in the project's image, and Android built separately on ubuntu-24.04 (x86_64) in Swift's image, because Android's SDK tools are x86_64 programs. With this change, each stage runs one job on ubuntu-24.04 with one Bazel output base on the runner's second disk (/mnt/bazel) and one cache group, ubuntu:

  • container (the required check keeps its name) replaces container and container-android.
  • populate replaces populate and populate-android. It builds everything, then the published Android app and the site.
  • verify replaces verify and verify-android. android now needs verify, and verify-android is gone from alpha-apple's needs and from tools/ci/verified.sh.
  • bazel8 is one x86_64 job instead of a two-runner matrix.
  • container-verify (the headful web and Linux tests under Xvfb and Chrome) and proof's web build moved to x86_64 too, so they read the same cache group. Only proof-compare stays on arm64, and it uses no Bazel cache.

The image. ghcr.io/attilathefun/visor-agent is arm64 only: every tag's manifest has one platform, linux/arm64. So the combined job runs in swift:6.4.2-noble (by digest, as the Android jobs already did). When the job builds Linux, tools/ci/job_tools.sh adds what the Linux apps link, matching the agent image's Dockerfile: SDL2, SDL2_ttf, GL, EGL, GTK 3, WebKitGTK, lld, libcurl, SQLite and NSS. It checks for them with pkg-config first, so in the agent image it does nothing. .bazelrc's build:linux already sets CC=clang, and MODULE.bazel already registers swift.org's ubuntu24.04 toolchains for x86_64 (exec, wasm and Android) beside aarch64. Chrome for Testing is pinned for both architectures.

The cache. The linux (3 GB) and android (2 GB) groups merge into ubuntu, trimmed to 5 GB, so the total in GitHub's 10 GB stays as it was. apple (2) and windows (1) are unchanged. The cache actions can also put the caches where a job's ISOMER_BAZEL_CACHE says. No job sets it yet: the disk cache stays in the home directory on the root disk, and Bazel's tree stays on /mnt.

container-apple and the Windows jobs are unchanged.

2. BuildBuddy's remote cache

  • .bazelrc and examples/.bazelrc get a buildbuddy config, with no key: the BES and cache endpoints, --remote_timeout=10m, --remote_cache_compression and --nolegacy_important_outputs.
  • tools/ci/ci_bazel.sh setup reads BUILDBUDDY_API_KEY. When it's set, setup writes --config=buildbuddy and the key's two headers into a file outside the checkout (~/.config/isomer-ci/buildbuddy.bazelrc, mode 600). .bazelrc.user imports that file by its path, so the key is never on a command line or in the log. Then setup unsets the variable.
  • Who gets the key. The key reads and writes, and a pull request could change ci_bazel.sh and upload with it. So the workflow passes the key, through the cache action's buildbuddy-api-key input to the setup step alone, only when github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main'). Pull requests and branch runs build on GitHub's cache alone.
  • Who writes. Of the runs that get the key, these upload: pushes to main (populate, bazel8), a published release's jobs, and alpha/alpha-apple on main. They also download every output (--remote_download_all), so the disk cache that GitHub's cache keeps stays whole. Main's other runs by hand (verify, proof) only read (--noremote_upload_local_results).
  • A read-only key for pull requests would be a secret of its own, BUILDBUDDY_READ_KEY. ci_bazel.sh has a commented place for it. It isn't wired yet.
  • The Windows jobs don't get the key, because their setup is in flux elsewhere.

3. A Waydroid probe (run: waydroid-probe)

This tests whether Android GUI tests could run in the same job as everything else on GitHub's hosted Ubuntu. It runs by hand only, on ubuntu-24.04, directly on the runner (not in a container), and stops after 20 minutes. It uses continue-on-error and nothing depends on it. tools/ci/waydroid_probe.sh does the following, each step time-limited:

  1. prints uname -a and the kernel config's binder and ashmem options, lists /dev/binder* and /dev/binderfs, and checks /proc/filesystems for binder;
  2. tries sudo modprobe binder_linux devices=binder,hwbinder,vndbinder. If that fails, it installs the kernel's linux-modules-extra package and tries again. Then it mounts binderfs and checks for ashmem;
  3. installs Waydroid from its official repository (repo.waydro.id) and runs waydroid init;
  4. starts the container (waydroid-container), then starts a session under a headless Weston;
  5. waits up to 5 minutes for sys.boot_completed, then runs waydroid status, adb connect <waydroid IP>:5555 and adb devices.

It writes a table of each step's result and a verdict to the job summary, and uploads its logs as the waydroid-probe artifact.

Testing

The workflow change can't run from this branch until it's committed, so nothing here has run the combined job, BuildBuddy or the probe under the new workflow. To test the combined build anyway, a temporary commit made the current workflow's x86_64 job (container-android, Swift's image, /mnt) build what the combined container builds (ISOMER_PLATFORMS="web linux android", container_build.sh pr), from cold (no cache). That commit is reverted before this is ready.

The result (run 43780835118, job container-android at the temporary commit). Every build and test passed, cold, in 72.5 minutes, in one output base:

  • job_tools.sh: 35 s, Linux libraries included.
  • The first build: 1,154 s.
  • The tests: 2,778 s in all. These were the Android build tests (8/8), the web's WASI and session tests (2/2), the headless and remote tests (5/5), the wasm checks (9/9), and the mode checks.
  • The x86_64 APK and the AndroidX override: 338 s.

Before, cold, the two jobs took 38 minutes (Linux, arm64) and 50 minutes (Android, x86_64), so 88 runner-minutes, but running side by side the check finished in 50 minutes. Combined, it's 72.5 runner-minutes but about 22 minutes longer to wait for, cold. Warm runs, from the merged cache, should be well under that.

Disk. On this runner /mnt is the root disk (145 GB, 81 GB free at the start). Bazel's tree used 39 GB, leaving 43 GB free with no disk cache in play. A cold populate writes a disk cache of about the same size beside it, which should still fit.

The arm64 container job (old workflow, branch scripts) also passed, in 35 minutes. In the project's image job_tools.sh took 7 s, the same as on main, so it added none of the Linux libraries. container-windows fails here as it does on main (populate-windows, MAX_PATH), which is unrelated.

BuildBuddy has no link from this pull request's runs, by design (pull requests don't get the key). Main's first populate after merging is the first run that connects, fills the cache and prints the Streaming build results to: https://app.buildbuddy.io/invocation/… links. Main's next build shows the hit rate and the warm time. Pull requests stay on GitHub's cache until there is a read-only key.

The workflow's change

git apply accepts it on this branch's head:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5c3e7c6..eb8a125 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,23 +4,31 @@
 # one, the GUI tests by hand, and the screenshot proof only ahead of a
 # release (run: release, or run: proof by hand). Since
 # 2026-11-15 on GitHub's own standard runners alone (a fork runs it as it
-# is; AGENTS.md, "The release proof" and "Signing"): the web and Linux in
-# the project's image (by digest) on arm64 Ubuntu; Android in Swift's image
-# on x86_64 Ubuntu (its SDK's tools are x86_64); the Apple targets on
+# is; AGENTS.md, "The release proof" and "Signing"): the web, Linux and
+# Android together, one job and one Bazel output base, in Swift's image (by
+# digest) on x86_64 Ubuntu, with the Linux apps' libraries added
+# (tools/ci/job_tools.sh; Android's SDK tools are x86_64, and the project's
+# own image is arm64 alone); the Apple targets on
 # `xcode-27` Macs with their own Xcode (Apple's SDKs may not be
 # redistributed); Windows on windows-11-arm with swift.org's Swift and the
 # image's own Visual Studio, built only (tier 2). Bazel's
 # caches are GitHub's (.github/actions/bazel_cache), written by main's
-# builds alone.
+# builds alone, and BuildBuddy's remote cache, its key the
+# BUILDBUDDY_API_KEY secret (read and write), handed to the cache action's
+# setup alone and only in runs on main and a published release's: never to
+# a pull request or a branch's run, whose scripts could upload with it
+# (tools/ci/ci_bazel.sh: main's push builds and the release jobs write;
+# main's other runs by hand read). Pull requests build on GitHub's cache
+# alone until a read-only key (BUILDBUDDY_READ_KEY) is theirs.
 #
-# - pull requests: container (web, Linux; the required check),
-#   container-android, container-apple, container-windows: every target
+# - pull requests: container (web, Linux, Android; the required check),
+#   container-apple, container-windows: every target
 #   built, then every test that draws nothing (container_build.sh pr).
-# - main's commits: populate, populate-android, populate-apple,
+# - main's commits: populate, populate-apple,
 #   populate-windows (the same, and what a release builds, into the cache;
 #   never a proof); bazel8, bazel8-apple.
 # - by hand (`run:`): verify (the builds and tests, no proof: verify,
-#   verify-android, verify-apple, verify-windows, container-verify, apple,
+#   verify-apple, verify-windows, container-verify, apple,
 #   android); proof (the screenshot proof alone: proof, proof-apple,
 #   proof-android, proof-shoot, proof-compare); prerelease (main: the
 #   Alphas, alpha-apple and alpha, signed with the `release` environment's
@@ -29,7 +37,9 @@
 #   the one run that proves and verifies at once, which tools/ci/verified.sh
 #   asks for);
 #   experiment (any branch but a release branch: the Storybook Lab drafted
-#   unsigned, as no environment's keys reach a branch). There is no adhoc
+#   unsigned, as no environment's keys reach a branch); waydroid-probe (a
+#   probe: whether Waydroid's Android boots on GitHub's hosted x86_64
+#   Ubuntu, tools/ci/waydroid_probe.sh; nothing depends on it). There is no adhoc
 #   run: a branch's builds are experiments only (the owner, 2026-11-12).
 #   Drafts are CI's: no agent publishes one or makes a tag.
 # - a published release (its v* tag, made in Reviews): verified
@@ -48,9 +58,9 @@ on:
   workflow_dispatch:
     inputs:
       run:
-        description: "What to run: verify (the tests, no proof), prerelease or release on main (verify on a branch to bisect); proof (the screenshot proof alone); experiment on any but a release branch"
+        description: "What to run: verify (the tests, no proof), prerelease or release on main (verify on a branch to bisect); proof (the screenshot proof alone); experiment on any but a release branch; waydroid-probe (a probe of Waydroid on the hosted runner) on any"
         type: choice
-        options: [verify, proof, prerelease, release, experiment]
+        options: [verify, proof, prerelease, release, experiment, waydroid-probe]
         default: verify
       kind:
         description: The proof's kind
@@ -84,20 +94,28 @@ env:
 jobs:
   # --- Pull requests: every platform built, the tests that draw nothing ---
 
+  # The web, Linux and Android in one job, one Bazel output base on the
+  # runner's second disk: Swift's image on x86_64 (Android's SDK tools are
+  # x86_64), the Linux apps' libraries added by job_tools.sh.
   container:
     if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04-arm
-    container: ghcr.io/attilathefun/visor-agent@sha256:849dcf6aeb16119e3b769b4f0c410b93ac58ed1e3b3ef2801f7534def3fbaaf0
+    runs-on: ubuntu-24.04
+    container:
+      image: swift:6.4.2-noble@sha256:23d9b28ad97fb1cf1999edc3a0cb265ee915ed42299a9344e7173d5a6d2b05f4
+      # Bazel's tree on the runner's second disk (ISOMER_BAZEL_ROOT).
+      volumes: ["/mnt:/mnt"]
     timeout-minutes: 180
     env:
-      ISOMER_PLATFORMS: web linux
+      ISOMER_PLATFORMS: web linux android
+      ISOMER_ANDROID_X86_64: "1"
+      ISOMER_BAZEL_ROOT: /mnt/bazel
     steps:
       - uses: actions/checkout@v5
       - name: The job's tools
         run: tools/ci/job_tools.sh
       - uses: ./.github/actions/bazel_cache
         with:
-          group: linux
+          group: ubuntu
       - name: Every target built, and the tests that draw nothing
         env:
           ISOMER_EXECUTION_LOGS: ${{ runner.temp }}/execution-logs
@@ -110,28 +128,6 @@ jobs:
           path: ${{ runner.temp }}/execution-logs
           retention-days: 7
 
-  container-android:
-    if: github.event_name == 'pull_request'
-    runs-on: ubuntu-24.04
-    container:
-      image: swift:6.4.2-noble@sha256:23d9b28ad97fb1cf1999edc3a0cb265ee915ed42299a9344e7173d5a6d2b05f4
-      # Bazel's tree on the runner's second disk (ISOMER_BAZEL_ROOT).
-      volumes: ["/mnt:/mnt"]
-    timeout-minutes: 180
-    env:
-      ISOMER_PLATFORMS: android
-      ISOMER_ANDROID_X86_64: "1"
-      ISOMER_BAZEL_ROOT: /mnt/bazel
-    steps:
-      - uses: actions/checkout@v5
-      - name: The job's tools
-        run: tools/ci/job_tools.sh
-      - uses: ./.github/actions/bazel_cache
-        with:
-          group: android
-      - name: The Android targets built, and the Android build tests
-        run: exec tools/ci/container_build.sh pr
-
   container-apple:
     if: github.event_name == 'pull_request'
     runs-on: xcode-27
@@ -175,38 +171,6 @@ jobs:
   # --- main: the merged tree built into GitHub's cache ---------------------
 
   populate:
-    if: github.event_name == 'push'
-    runs-on: ubuntu-24.04-arm
-    container: ghcr.io/attilathefun/visor-agent@sha256:849dcf6aeb16119e3b769b4f0c410b93ac58ed1e3b3ef2801f7534def3fbaaf0
-    timeout-minutes: 180
-    env:
-      ISOMER_PLATFORMS: web linux
-    steps:
-      - uses: actions/checkout@v5
-      - name: The job's tools
-        run: tools/ci/job_tools.sh
-      - id: cache
-        uses: ./.github/actions/bazel_cache
-        with:
-          group: linux
-      - name: The merged tree, built into the cache
-        env:
-          ISOMER_EXECUTION_LOGS: ${{ runner.temp }}/execution-logs
-        run: exec tools/ci/container_build.sh all
-      - uses: ./.github/actions/bazel_cache_save
-        if: ${{ !cancelled() }}
-        with:
-          group: linux
-          gigabytes: 3
-          repository-hit: ${{ steps.cache.outputs.repository-hit }}
-      - uses: actions/upload-artifact@v4
-        if: ${{ !cancelled() }}
-        with:
-          name: execution-logs
-          path: ${{ runner.temp }}/execution-logs
-          retention-days: 7
-
-  populate-android:
     if: github.event_name == 'push'
     runs-on: ubuntu-24.04
     container:
@@ -214,7 +178,7 @@ jobs:
       volumes: ["/mnt:/mnt"]
     timeout-minutes: 180
     env:
-      ISOMER_PLATFORMS: android
+      ISOMER_PLATFORMS: web linux android
       ISOMER_ANDROID_X86_64: "1"
       ISOMER_BAZEL_ROOT: /mnt/bazel
     steps:
@@ -224,19 +188,30 @@ jobs:
       - id: cache
         uses: ./.github/actions/bazel_cache
         with:
-          group: android
-      - name: The merged tree's Android targets, built into the cache
+          group: ubuntu
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
+      - name: The merged tree, built into the cache
+        env:
+          ISOMER_EXECUTION_LOGS: ${{ runner.temp }}/execution-logs
         run: exec tools/ci/container_build.sh all
       # And what a release builds here: the Android app and the site as
       # alpha builds them (never the proof's apps: no proof on a push).
       - name: The published Android app and site, built into the cache
         run: exec tools/ci/container_build.sh package .ci/packages --config=alpha $PUBLISHED_LINUX
+      # The web, Linux and Android's share of GitHub's 10 GB: what the two
+      # groups (linux 3, android 2) had.
       - uses: ./.github/actions/bazel_cache_save
         if: ${{ !cancelled() }}
         with:
-          group: android
-          gigabytes: 2
+          group: ubuntu
+          gigabytes: 5
           repository-hit: ${{ steps.cache.outputs.repository-hit }}
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          name: execution-logs
+          path: ${{ runner.temp }}/execution-logs
+          retention-days: 7
 
   populate-apple:
     if: github.event_name == 'push'
@@ -250,6 +225,7 @@ jobs:
         uses: ./.github/actions/bazel_cache
         with:
           group: apple
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: The merged tree's Apple targets, built into the cache
         run: exec tools/ci/container_build.sh all
       - name: The published Apple apps, built into the cache
@@ -293,43 +269,34 @@ jobs:
           repository-hit: ${{ steps.cache.outputs.repository-hit }}
 
   bazel8:
-    # The Storybooks built with the oldest Bazel isomer supports.
+    # The Storybooks built with the oldest Bazel isomer supports: the web,
+    # Linux and Android together, as container builds them.
     if: github.event_name == 'push'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - group: linux
-            runner: ubuntu-24.04-arm
-            image: ghcr.io/attilathefun/visor-agent@sha256:849dcf6aeb16119e3b769b4f0c410b93ac58ed1e3b3ef2801f7534def3fbaaf0
-            targets: >-
-              //web/storybook_web_application:storybook_web_application
-              //linux/storybook_linux_application:storybook_linux_application
-          - group: android
-            runner: ubuntu-24.04
-            image: swift:6.4.2-noble@sha256:23d9b28ad97fb1cf1999edc3a0cb265ee915ed42299a9344e7173d5a6d2b05f4
-            targets: //android/storybook_android_application:storybook_android_application_apk
-    runs-on: ${{ matrix.runner }}
+    runs-on: ubuntu-24.04
     container:
-      image: ${{ matrix.image }}
+      image: swift:6.4.2-noble@sha256:23d9b28ad97fb1cf1999edc3a0cb265ee915ed42299a9344e7173d5a6d2b05f4
       volumes: ["/mnt:/mnt"]
     timeout-minutes: 180
     env:
       USE_BAZEL_VERSION: 8.5.0
-      ISOMER_PLATFORMS: ${{ matrix.group == 'linux' && 'web linux' || 'android' }}
+      ISOMER_PLATFORMS: web linux android
+      ISOMER_BAZEL_ROOT: /mnt/bazel
     steps:
       - uses: actions/checkout@v5
       - name: The job's tools
         run: tools/ci/job_tools.sh
       - uses: ./.github/actions/bazel_cache
         with:
-          group: ${{ matrix.group }}
+          group: ubuntu
           disk: "false"
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       # Built only (container_build.sh's checks take Bazel 9's test flags).
       - name: The Storybooks with Bazel 8.5.0
-        env:
-          TARGETS: ${{ matrix.targets }}
-        run: exec tools/ci/container_build.sh $TARGETS
+        run: >-
+          exec tools/ci/container_build.sh
+          //web/storybook_web_application:storybook_web_application
+          //linux/storybook_linux_application:storybook_linux_application
+          //android/storybook_android_application:storybook_android_application_apk
 
   bazel8-apple:
     if: github.event_name == 'push'
@@ -343,6 +310,7 @@ jobs:
       - uses: ./.github/actions/bazel_cache
         with:
           group: apple
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
           disk: "false"
       - name: The Apple Storybooks with Bazel 8.5.0
         run: >-
@@ -354,23 +322,6 @@ jobs:
   # --- By hand: verify (the GUI tests) ------------------------------------
 
   verify:
-    if: github.event_name == 'workflow_dispatch' && (inputs.run == 'verify' || inputs.run == 'release')
-    runs-on: ubuntu-24.04-arm
-    container: ghcr.io/attilathefun/visor-agent@sha256:849dcf6aeb16119e3b769b4f0c410b93ac58ed1e3b3ef2801f7534def3fbaaf0
-    timeout-minutes: 180
-    env:
-      ISOMER_PLATFORMS: web linux
-    steps:
-      - uses: actions/checkout@v5
-      - name: The job's tools
-        run: tools/ci/job_tools.sh
-      - uses: ./.github/actions/bazel_cache
-        with:
-          group: linux
-      - name: Build, and the tests in the build container
-        run: exec tools/ci/container_build.sh
-
-  verify-android:
     if: github.event_name == 'workflow_dispatch' && (inputs.run == 'verify' || inputs.run == 'release')
     runs-on: ubuntu-24.04
     container:
@@ -378,7 +329,7 @@ jobs:
       volumes: ["/mnt:/mnt"]
     timeout-minutes: 180
     env:
-      ISOMER_PLATFORMS: android
+      ISOMER_PLATFORMS: web linux android
       ISOMER_BAZEL_ROOT: /mnt/bazel
     steps:
       - uses: actions/checkout@v5
@@ -386,8 +337,9 @@ jobs:
         run: tools/ci/job_tools.sh
       - uses: ./.github/actions/bazel_cache
         with:
-          group: android
-      - name: Build, and the Android build tests
+          group: ubuntu
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
+      - name: Build, and the tests in the build container
         run: exec tools/ci/container_build.sh
       - uses: actions/upload-artifact@v4
         with:
@@ -411,6 +363,7 @@ jobs:
       - uses: ./.github/actions/bazel_cache
         with:
           group: apple
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: Build, with this Mac's Xcode
         run: exec tools/ci/container_build.sh
       - uses: actions/upload-artifact@v4
@@ -458,18 +411,22 @@ jobs:
     # and the Linux app under Xvfb, driven as apple drives the iPhone's and
     # the Mac's (tools/ci/container_build.sh headful). A release needs it.
     if: github.event_name == 'workflow_dispatch' && (inputs.run == 'verify' || inputs.run == 'release')
-    runs-on: ubuntu-24.04-arm
-    container: ghcr.io/attilathefun/visor-agent@sha256:849dcf6aeb16119e3b769b4f0c410b93ac58ed1e3b3ef2801f7534def3fbaaf0
+    runs-on: ubuntu-24.04
+    container:
+      image: swift:6.4.2-noble@sha256:23d9b28ad97fb1cf1999edc3a0cb265ee915ed42299a9344e7173d5a6d2b05f4
+      volumes: ["/mnt:/mnt"]
     timeout-minutes: 120
     env:
       ISOMER_PLATFORMS: web linux
+      ISOMER_BAZEL_ROOT: /mnt/bazel
     steps:
       - uses: actions/checkout@v5
       - name: The job's tools
         run: tools/ci/job_tools.sh
       - uses: ./.github/actions/bazel_cache
         with:
-          group: linux
+          group: ubuntu
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: The tests that draw
         env:
           ISOMER_EXECUTION_LOGS: ${{ runner.temp }}/execution-logs
@@ -534,7 +491,7 @@ jobs:
   android:
     # The Android Storybook's tests on GitHub's own Ubuntu runner, the
     # emulator on its KVM (tools/ci/hosted_android_test.sh).
-    needs: verify-android
+    needs: verify
     if: ${{ !cancelled() && github.event_name == 'workflow_dispatch' && (inputs.run == 'verify' || inputs.run == 'release') }}
     runs-on: ubuntu-24.04
     timeout-minutes: 90
@@ -571,14 +528,18 @@ jobs:
 
   proof:
     if: github.event_name == 'workflow_dispatch' && (inputs.run == 'release' || inputs.run == 'proof')
-    runs-on: ubuntu-24.04-arm
-    container: ghcr.io/attilathefun/visor-agent@sha256:849dcf6aeb16119e3b769b4f0c410b93ac58ed1e3b3ef2801f7534def3fbaaf0
+    runs-on: ubuntu-24.04
+    container:
+      image: swift:6.4.2-noble@sha256:23d9b28ad97fb1cf1999edc3a0cb265ee915ed42299a9344e7173d5a6d2b05f4
+      volumes: ["/mnt:/mnt"]
     concurrency:
       group: isomer-proof-${{ github.ref }}
       cancel-in-progress: false
     timeout-minutes: 180
     env:
       PROOF_KIND: ${{ inputs.kind || 'full' }}
+      ISOMER_PLATFORMS: web
+      ISOMER_BAZEL_ROOT: /mnt/bazel
     steps:
       - uses: actions/checkout@v5
         with:
@@ -587,7 +548,8 @@ jobs:
         run: tools/ci/job_tools.sh
       - uses: ./.github/actions/bazel_cache
         with:
-          group: linux
+          group: ubuntu
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: The web app built
         run: exec tools/ci/proof.sh --stage build --platform web --kind "$PROOF_KIND" --apps "$RUNNER_TEMP/proof-apps" --review "$RUNNER_TEMP/proof-review"
       - uses: actions/upload-artifact@v4
@@ -615,6 +577,7 @@ jobs:
       - uses: ./.github/actions/bazel_cache
         with:
           group: apple
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: The iPhone and Mac apps built, with this Mac's Xcode
         run: exec tools/ci/proof.sh --stage build --platform ios,macos --kind "$PROOF_KIND" --apps "$RUNNER_TEMP/proof-apps" --review "$RUNNER_TEMP/proof-review"
       - uses: actions/upload-artifact@v4
@@ -652,7 +615,8 @@ jobs:
         run: tools/ci/job_tools.sh
       - uses: ./.github/actions/bazel_cache
         with:
-          group: android
+          group: ubuntu
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: The Android app built, for x86_64
         run: exec tools/ci/proof.sh --stage build --platform android --kind "$PROOF_KIND" --apps "$RUNNER_TEMP/proof-apps" --review "$RUNNER_TEMP/proof-review"
       - uses: actions/upload-artifact@v4
@@ -763,11 +727,11 @@ jobs:
   alpha-apple:
     # The Apple Alphas, built unsigned (alpha signs them); the version found
     # here and handed to alpha.
-    needs: [verify, verify-android, verify-apple, container-verify, apple, android, proof-compare]
+    needs: [verify, verify-apple, container-verify, apple, android, proof-compare]
     if: >-
       always() && github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' &&
       (inputs.run == 'prerelease' || (inputs.run == 'release' &&
-      needs.verify.result == 'success' && needs.verify-android.result == 'success' &&
+      needs.verify.result == 'success' &&
       needs.verify-apple.result == 'success' && needs.container-verify.result == 'success' &&
       needs.apple.result == 'success' && needs.android.result == 'success' &&
       needs.proof-compare.result == 'success'))
@@ -788,6 +752,7 @@ jobs:
       - uses: ./.github/actions/bazel_cache
         with:
           group: apple
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: Build
         env:
           ISOMER_PLATFORMS: apple
@@ -842,7 +807,8 @@ jobs:
         run: tools/ci/check_version_line.sh "$VERSION"
       - uses: ./.github/actions/bazel_cache
         with:
-          group: android
+          group: ubuntu
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       # exec: the runner's cancel reaches the build.
       - name: Build
         run: exec tools/ci/container_build.sh package .ci/packages --config=alpha $PUBLISHED_LINUX
@@ -918,6 +884,7 @@ jobs:
       - uses: ./.github/actions/bazel_cache
         with:
           group: apple
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
           disk: "false"
       - name: Build
         env:
@@ -937,6 +904,33 @@ jobs:
           "The Storybook as an experiment: the publishing path for experiments, before the whole wasm apps"
           "$RUNNER_TEMP/assets" "$RUNNER_TEMP/notes.md"
 
+  # --- By hand: a probe -------------------------------------------------
+
+  waydroid-probe:
+    # Whether Waydroid (Android in a container on the host's own kernel,
+    # binder and all) boots on GitHub's hosted x86_64 Ubuntu, so the Android
+    # GUI tests could run in the same job as everything else
+    # (tools/ci/waydroid_probe.sh: the kernel, binder, Waydroid from its
+    # repository, its container and a session, Android's boot and adb; the
+    # findings in the run's summary). On the runner itself, not in a
+    # container. Nothing depends on it, and it never fails the run.
+    if: github.event_name == 'workflow_dispatch' && inputs.run == 'waydroid-probe'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 20
+    continue-on-error: true
+    steps:
+      - uses: actions/checkout@v5
+      - name: Waydroid, probed
+        continue-on-error: true
+        run: tools/ci/waydroid_probe.sh "$RUNNER_TEMP/waydroid-probe"
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        continue-on-error: true
+        with:
+          name: waydroid-probe
+          path: ${{ runner.temp }}/waydroid-probe
+          retention-days: 14
+
   # --- A published release: nothing Apple rebuilt -----------------------
 
   release-apple:
@@ -953,6 +947,7 @@ jobs:
       - uses: ./.github/actions/bazel_cache
         with:
           group: apple
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: The iPhone's, for the simulator
         env:
           ISOMER_PLATFORMS: apple
@@ -1011,7 +1006,8 @@ jobs:
         run: tools/ci/stamp_apps.sh
       - uses: ./.github/actions/bazel_cache
         with:
-          group: android
+          group: ubuntu
+          buildbuddy-api-key: ${{ (github.event_name == 'release' || (github.event_name != 'pull_request' && github.ref == 'refs/heads/main')) && secrets.BUILDBUDDY_API_KEY || '' }}
       - name: Android's, for production
         run: >-
           tools/ci/container_build.sh package .ci/android --config=prod --compilation_mode=opt

logan-shire-agent Bot and others added 6 commits November 15, 2026 19:28
…Buddy's remote cache, a Waydroid probe (scripts; the workflow's change is in the pull request's body)
…oid together, from cold (reverted before merging)"

This reverts commit 4b0e906.
… key for main and releases alone; a Waydroid probe by hand
@logan-shire-agent
logan-shire-agent Bot marked this pull request as ready for review November 16, 2026 08:31
@logan-shire-agent
logan-shire-agent Bot merged commit 79818dc into main Nov 16, 2026
24 of 25 checks passed
@logan-shire-agent
logan-shire-agent Bot deleted the ci-linux-android-x86 branch November 16, 2026 09:52
logan-shire-agent Bot added a commit that referenced this pull request Nov 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant