Skip to content

Repin the runtime to makepad 39a9de88 (OpenHarmony idle and input, GL GPU timing, terminal shortcuts) - #289

Merged
ymote merged 1 commit into
mainfrom
chore/repin-makepad-39a9de88
Oct 2, 2026
Merged

ymote merged 1 commit into
mainfrom
chore/repin-makepad-39a9de88

Conversation

@ymote

@ymote ymote commented Oct 2, 2026 •

Copy link
Copy Markdown
Contributor

Moves the runtime from makepad e29a0eaa to makepad main 39a9de88, through Octoscript-Makepad 62760863 (OctoScript-Makepad#70). The new makepad changes:

makepad #90 (OpenHarmony NDK input and ArkWeb) is not in this revision. A proposed rebase is on proposal/pr90-rebased-on-84-85.

What moves

Checks

  • python3 tools/setup.py --update, python3 tools/setup.py --check --cargo and python3 tools/native_apps.py --check all pass. The old makepad and Octoscript-Makepad hashes now appear only in ADR 0004's history.
  • The patched makepad tree passes cargo check -p makepad-widgets -p makepad-terminal on the macOS host and for aarch64-linux-android.
  • makepad 39a9de88 itself: Linux check passes; terminal tests 550/550; draw has the 3 known road_pack_tests failures. On macOS the host and Android checks pass. OpenHarmony was only type-checked, with a stub C compiler (no SDK).
  • Local CI on the exact head (tools/ci-local.sh --only all --linux-host --keep-going --jobs 6) runs before merging, after the merge queue (Desktop: find the packaged octos kernel and refuse one of another revision #256 stopped).

🤖 Generated with Claude Code

@ymote
ymote force-pushed the chore/repin-makepad-39a9de88 branch 2 times, most recently from 5790b6d to c80c0a7 Compare October 2, 2026 20:29
… GPU timing, terminal shortcuts)

Makepad main 39a9de88 adds a hidden map's idle frame loop fix (#79),
Android HTTP without redirects (#75), the sheets font by crate (#80),
Linux GL remote grabs (#93), Android Vulkan without a debug messenger
(#92), the touch-down power hint (#83), GL GPU timing (#81), atlas text
on phones (#82), the DrawText current-list fix (#89), terminal keyboard
shortcuts (#76) and the terminal on OpenHarmony (#91), and OpenHarmony's
keyboard, Studio, GL lifetimes and idle frames (#84, #85, #88, #87),
through Octoscript-Makepad 62760863 (#70). makepad #90 is not in it.

- root Cargo.toml: makepad and octoscript-makepad revisions together;
  native-apps.json (Sheets, Terminal), regenerated pins unchanged otherwise
- both native-runtime.lock.json files
- runtime-patches.lock.json: the settings patch is rebased onto 39a9de88
  with the same added and removed lines; its touch-down line in
  MakepadActivity.java now sits next to #83's hint, and draw_text.rs
  context follows #87's cfg. The system-back, IME and two Windows patches
  reapply unchanged. The map, OpenHarmony GL-lifetime and DrawText patches
  are dropped: they are makepad #79, #88 and #89, now upstream. New tree
  976bf55b.
- Cargo.lock: unchanged
- the pinned-hash docs under phone/docs; rom/docs/home-build.md follows in
  its own change, so this one does not trigger rom.yml (whose jobs local
  CI cannot run)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@ymote
ymote force-pushed the chore/repin-makepad-39a9de88 branch from c80c0a7 to 01ca2c5 Compare October 2, 2026 20:44
@ymote

ymote commented Oct 2, 2026

Copy link
Copy Markdown
Contributor Author

Local CI passed on 01ca2c5 (tools/ci-local.sh --only all --linux-host, 11m47s, Darwin arm64; the ubuntu jobs on the Linux build host, Linux x86_64).

GitHub would run for this PR: desktop.yml, phone.yml, apps.yml. Merged on this local pass (macOS runner queue); GitHub CI runs on the merge commit on main.

Job Step Result Time
ci-local / drift The local mapping fits the workflows PASS -
desktop.yml / desktop Prepare the pinned framework sources PASS 0s
desktop.yml / desktop Compile the desktop with the shared runtime PASS 1m11s
desktop.yml / desktop One copy of every shell source PASS -
desktop.yml / desktop Desktop tools and scripts PASS 9s
desktop.yml / desktop One Makepad, App Hub, octos and Rinx in the locked graph PASS 1s
desktop.yml / desktop The native apps' generated places match native-apps.json PASS 0s
phone.yml / home Prepare pinned sources and the reviewed runtime patch PASS 0s
phone.yml / home Compile Home and its bundled modules PASS 1m12s
phone.yml / home Verify the single runtime graph PASS 1s
phone.yml / home The native apps' generated places match native-apps.json PASS -
phone.yml / home The pinned octos revision PASS -
phone.yml / home Build octos (unless cached) PASS -
phone.yml / home Build Home, App Hub admission and runtime policy tests PASS 1m30s
phone.yml / home Test Home, App Hub admission and runtime policy PASS 5m24s
phone.yml / home Two-lane scenario (real kernel, scripted model) PASS 33s
apps.yml / services (linux) python3 tools/setup.py PASS 0s
apps.yml / services (linux) Kernel service PASS 10s
apps.yml / services (linux) App peers PASS 23s
apps.yml / services (linux) AI providers config PASS 3s
apps.yml / services (linux) L0 in-card chat (sys.chat, host side) PASS 8s
apps.yml / services (linux) System toolbox (workflow templates) PASS 1m28s
apps.yml / kernel-security (linux) python3 tools/setup.py PASS 0s
apps.yml / kernel-security (linux) The pinned octos revision PASS -
apps.yml / kernel-security (linux) Build octos (unless cached) PASS -
apps.yml / kernel-security (linux) Real-kernel tests PASS 30s
apps.yml / apps python3 tools/setup.py PASS 1s
apps.yml / apps Host services (Mail, AI providers, News) PASS 17s
apps.yml / apps Shell AI services (crates/ai-host) PASS 30s
apps.yml / apps AppCard runtime setup safeguards PASS 0s
apps.yml / apps AppCard clippy (own crates; shared runtime compiles) PASS 40s
apps.yml / apps AppCard transport and store PASS 11s
apps.yml / apps One Makepad, App Hub, octos and Rinx in the locked graph PASS 5s
rom.yml / product (linux) python3 -m unittest discover -s tests -v SKIPPED (!) -
rom.yml / product (linux) Check generated Agent Binder client SKIPPED (!) -
rom.yml / product (linux) bash -n scripts/stage-forks.sh scripts/publish-release.sh scripts/apply-to-tree.sh scripts/build-rom.sh PASS -
rom.yml / web-installer (linux) npm ci --ignore-scripts --no-audit --no-fund SKIPPED (!) -
rom.yml / web-installer (linux) npm test SKIPPED (!) -
rom.yml / web-installer (linux) npx playwright install --with-deps chromium SKIPPED (!) -
rom.yml / web-installer (linux) npm run test:browser SKIPPED (!) -
rom.yml / web-installer (linux) python3 -m unittest discover -s tests -p test_installer_manifest.py -v SKIPPED (!) -
rom.yml / web-installer (linux) bash -n scripts/release.sh SKIPPED (!) -
linux-host / sandbox (linux) python3 tools/setup.py PASS 0s
linux-host / sandbox (linux) Process sandbox on Linux (Landlock, seccomp) PASS 1m17s

Skipped (these did NOT pass; (!) marks a skip that blocks tools/ci-local-merge.sh):

  • rom.yml / product (linux): python3 -m unittest discover -s tests -v: javac -version does not work here: install a JDK (17 or newer) and put its bin/ on PATH or set JAVA_HOME
  • rom.yml / product (linux): Check generated Agent Binder client: needs build-tools/35.0.0/aidl, platforms/android-35/framework.aidl in the Android SDK (no Android SDK found): install the SDK packages 'build-tools;35.0.0' and 'platforms;android-35' (sdkmanager) and set ANDROID_HOME
  • rom.yml / web-installer (linux): npm ci --ignore-scripts --no-audit --no-fund: no node, npm, npx on PATH (the workflow uses node 24); put node on PATH
  • rom.yml / web-installer (linux): npm test: no node, npm, npx on PATH (the workflow uses node 24); put node on PATH
  • rom.yml / web-installer (linux): npx playwright install --with-deps chromium: no node, npm, npx on PATH (the workflow uses node 24); put node on PATH
  • rom.yml / web-installer (linux): npm run test:browser: no node, npm, npx on PATH (the workflow uses node 24); put node on PATH
  • rom.yml / web-installer (linux): python3 -m unittest discover -s tests -p test_installer_manifest.py -v: no node, npm, npx on PATH (the workflow uses node 24); put node on PATH
  • rom.yml / web-installer (linux): bash -n scripts/release.sh: no node, npm, npx on PATH (the workflow uses node 24); put node on PATH

Notes:

  • GitHub runs Python 3.12; this run used Python 3.9.6
  • GitHub runs Python 3.12; the Linux host used Python 3.14.4

@ymote
ymote merged commit f6678b5 into main Oct 2, 2026
4 of 5 checks passed
ymote added a commit that referenced this pull request Oct 2, 2026


#289 moved the runtime to makepad main 39a9de88 and Octoscript-Makepad
62760863; this is the one line of rom/docs/home-build.md that names them,
split out so the repin itself did not trigger rom.yml.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ymote added a commit that referenced this pull request Oct 2, 2026
…e-hashes

rom docs: the runtime's Makepad and Octoscript-Makepad hashes after #289
tyreseluo pushed a commit to tyreseluo/OctoSense that referenced this pull request Oct 4, 2026
…s, CEF profile under MAKEPAD_HOME)

Moves the runtime from makepad 39a9de88 to makepad main c155f61d,
through Octoscript-Makepad 2cc5ef37 (OctoSense-org#71). New in makepad:
- OctoSense-org#94 Files, Task and Browser: an empty library beside each binary
- OctoSense-org#95 Calculator, Clock, Notes, Reminders, Weather: each module opens its
  own agent's link and answers its tools there
- OctoSense-org#96 hosted Notes and Reminders start empty
- OctoSense-org#97 Files' chat panel only reads
- OctoSense-org#98 CEF keeps its stable profile under MAKEPAD_HOME when that is set

Root Cargo.toml (every makepad revision, octoscript-makepad and
octoscript-node), the Sheets and Terminal revisions in native-apps.json,
both native-runtime.lock.json files, and runtime-patches.lock.json: base
c155f61d, the five patches reapply unchanged (none touches a changed
file), new tree 3eadf628. Cargo.lock does not change. The phone docs
that name the pinned hashes move with it; rom/docs/home-build.md gets
its own follow-up, as with OctoSense-org#289.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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