From 3997d80e8ca87b7bb4a1a11865356a99cf4e49b5 Mon Sep 17 00:00:00 2001 From: Waozi Date: Wed, 18 Nov 2026 17:14:03 -0300 Subject: [PATCH] Pin Kryon 0.6.0 and Ziran 0.7.0 Breeze moves to the released Kryon v0.6.0 (8d5d2e75) on Ziran 0.7.0 (55b01768), with plot 2b971b1b, css 9ee24b3f, game2d fcacb49c, entity fc8f3d89 and apps b95d1933 pinned to the same pair, so the lock keeps one Kryon and one toolchain. AppsControllerSha256 is the controller built from Apps b95d1933 on this graph. A toolchain bump broke the Android build twice with stale objects: - The Android CMake built its own copy of the toolchain in build/ziran-toolchain, shared across Ziran commits. It now uses the pinned checkout's build, which make already builds and which is per commit. - build-bundle-runtime.py reused its output folder across toolchains, and Ziran's make kept headers generated by the older Ziran because the new checkout's sources were older than them. The output now records the checkout it was built from and starts empty for another one. Local tests: native, desktop-window-test and habit-day-ui-test on a private Xvfb, the Ziran and native unit tests, the web build with its browser smoke test, windows-package, and the arm64 debug APK running on a Pixel 4a. apps-test passes except the packaged-locale checks, which fail only because of another lane's uncommitted src/locale_parser.zi. Co-Authored-By: Claude Opus 5.5 --- droid/app/src/main/cpp/CMakeLists.txt | 4 +- ...026-11-15-breeze-desktop-without-raylib.md | 2 +- scripts/build-bundle-runtime.py | 9 ++ src/apps/apps_controller.zi | 6 +- ziran.lock | 100 +++++++++--------- ziran.toml | 14 +-- 6 files changed, 73 insertions(+), 62 deletions(-) mode change 100755 => 100644 scripts/build-bundle-runtime.py diff --git a/droid/app/src/main/cpp/CMakeLists.txt b/droid/app/src/main/cpp/CMakeLists.txt index 1b7442736..b2b59681e 100644 --- a/droid/app/src/main/cpp/CMakeLists.txt +++ b/droid/app/src/main/cpp/CMakeLists.txt @@ -53,7 +53,9 @@ if(NOT TARGET oqs) message(FATAL_ERROR "Android builds require liboqs for sync account crypto") endif() set(ZIRAN_DIR "${REPO_ROOT}/build/packages/ziran") -set(ZIRAN_BUILD_DIR "${REPO_ROOT}/build/ziran-toolchain") +# The pinned toolchain's own build, which `make` shares. Its checkout is +# per commit, so a pin change never reuses objects from an older Ziran. +set(ZIRAN_BUILD_DIR "${ZIRAN_DIR}/build") set(ZI2C_BIN "${ZIRAN_BUILD_DIR}/bin/zi2c") set(ZI2ZIR_BIN "${ZIRAN_BUILD_DIR}/bin/zi2zir") file(GLOB ZIRAN_SOURCES CONFIGURE_DEPENDS diff --git a/plans/2026-11-15-breeze-desktop-without-raylib.md b/plans/2026-11-15-breeze-desktop-without-raylib.md index 502680c20..b3f8d4aea 100644 --- a/plans/2026-11-15-breeze-desktop-without-raylib.md +++ b/plans/2026-11-15-breeze-desktop-without-raylib.md @@ -219,7 +219,7 @@ Ziran's. ## Open work Owner, 2026-11-17: "are yo udonig this please finsh removing rayilb". Breeze -builds with no raylib on every host, on Ziran 0c4465a4, Kryon 1774e550 and +builds with no raylib on every host, on Ziran 0.7.0, Kryon 0.6.0 and plot, entity, apps, css and game2d pinned to that Kryon. Linux and Windows run on Kryon's SDL2 and Cairo desktop host, Android on its own-loop `android_runtime` with Pixmap, and the browser on Kryon's canvas. Audio is diff --git a/scripts/build-bundle-runtime.py b/scripts/build-bundle-runtime.py old mode 100755 new mode 100644 index 8cad024b3..46938649e --- a/scripts/build-bundle-runtime.py +++ b/scripts/build-bundle-runtime.py @@ -10,6 +10,7 @@ Ziran's generated C comes from the pinned toolchain's own host zi2c import argparse from pathlib import Path +import shutil import subprocess p = argparse.ArgumentParser() @@ -26,6 +27,13 @@ output = a.output.resolve() host_zi2c = source / "build/bin/zi2c" if not host_zi2c.is_file(): raise SystemExit(f"{host_zi2c} is missing; build the pinned toolchain first") +# Ziran's make compares file times, and a newly pinned toolchain's sources can +# be older than the last runtime built here, so the output records the +# checkout it was built from and another checkout starts from an empty folder. +marker = output / ".toolchain-source" +if output.exists() and (not marker.is_file() or marker.read_text() != str(source)): + shutil.rmtree(output) +output.mkdir(parents=True, exist_ok=True) command = [ "make", "-j4", @@ -43,3 +51,4 @@ if a.wasm: command += ["TARGET_MACHINE=wasm32-unknown-emscripten"] command += [str(output / "libziran.a")] subprocess.run(command, check=True) +marker.write_text(str(source)) diff --git a/src/apps/apps_controller.zi b/src/apps/apps_controller.zi index d864deadb..1a72cda2f 100644 --- a/src/apps/apps_controller.zi +++ b/src/apps/apps_controller.zi @@ -1,5 +1,5 @@ // Trusted shared Apps UI reviewed for this host. Containers may carry these // bytes, but cannot select or replace the host's controller trust anchor. -// Apps 764f24b4 with the Mesh client adoption, reproduced with Breeze's -// locked Ziran 0c4465a4 and Kryon 1774e550 graph. -AppsControllerSha256 :: "e833fd71a69408fe92d636f4b9f701230c160f2f9b65fda4900d8a22ed13c06c" +// Apps b95d1933 with the Mesh client adoption, reproduced with Breeze's +// locked Ziran 0.7.0 and Kryon 0.6.0 graph. +AppsControllerSha256 :: "68cb1b2800808190eab43a0b4267ca8efe0049662d355d196abc71464188ae66" diff --git a/ziran.lock b/ziran.lock index 2458f5a22..c779bad74 100644 --- a/ziran.lock +++ b/ziran.lock @@ -11,12 +11,12 @@ "url": "https://github.com/LoupVaillant/Monocypher.git" }, { - "commit": "1774e55057346b1c2fe10c211dc87eee29d3adcb", + "commit": "8d5d2e752a219674f993473c8410847ba42fad48", "dependencies": {"audio": "p59deb49c7f103127", "avif": "pb203529d803e73a4", "image_codec": "p69c0e968ae5735d9", "libaom": "p74ab3cb6eb3b86fa", "libavif": "p57c0272208aae8db", "libwebp": "p3b3c785a0e17e605", "sdl3": "p16cd0434af3dff7b", "webp": "p2af20e0c835b1c63"}, "dependency_refs": {"audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "avif": "2611e727e226a2af22dfb7f10bf224bd2f1a3d30", "image_codec": "360553150917f352e49e1beb78917370792ccaef", "libaom": "b141d9c45db236335351c8a4b2a14b3ade27c937", "libavif": "1aadfad932c98c069a1204261b1856f81f3bc199", "libwebp": "1844042d1ca751e62e61df7617dba19c98588339", "sdl3": "829a65d769d935c4852f8159e964312c0957260a", "webp": "ec6ed304767e10c125ab2820f3b01d6fd773e147"}, - "id": "p076741f1d5f9be83", + "id": "p09ea4e5550e9f459", "name": "kryon", - "ref": "1774e55057346b1c2fe10c211dc87eee29d3adcb", + "ref": "8d5d2e752a219674f993473c8410847ba42fad48", "url": "https://github.com/kryonlabs/kryon.git" }, { @@ -45,15 +45,6 @@ "source": true, "url": "https://github.com/libsdl-org/SDL.git" }, - { - "commit": "be13b17487789055b3bfa176035237e6b59f56df", - "dependencies": {"kryon": "p076741f1d5f9be83"}, - "dependency_refs": {"kryon": "1774e55057346b1c2fe10c211dc87eee29d3adcb"}, - "id": "p22f6dd89a47ff56a", - "name": "plot", - "ref": "be13b17487789055b3bfa176035237e6b59f56df", - "url": "https://github.com/kryonlabs/plot.git" - }, { "commit": "ec6ed304767e10c125ab2820f3b01d6fd773e147", "dependencies": {"image_codec": "p69c0e968ae5735d9", "libwebp": "p3b3c785a0e17e605"}, @@ -64,13 +55,13 @@ "url": "https://github.com/ziranlang/webp.git" }, { - "commit": "6aa491e34997a59577094d81da5361eb8be8b5f4", - "dependencies": {"kryon": "p076741f1d5f9be83"}, - "dependency_refs": {"kryon": "1774e55057346b1c2fe10c211dc87eee29d3adcb"}, - "id": "p35ab9177ed5d22ac", - "name": "Css", - "ref": "6aa491e34997a59577094d81da5361eb8be8b5f4", - "url": "https://github.com/kryonlabs/css.git" + "commit": "b95d19334ab4338d3611ec9d44db62b50694e464", + "dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p09ea4e5550e9f459", "mesh_client": "p8204ae87a845c1c3"}, + "dependency_refs": {"crypto": "master", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449"}, + "id": "p333db0ddd841f1ec", + "name": "Apps", + "ref": "b95d19334ab4338d3611ec9d44db62b50694e464", + "url": "https://github.com/waozixyz/apps.git" }, { "commit": "1844042d1ca751e62e61df7617dba19c98588339", @@ -135,6 +126,15 @@ "ref": "bd278217e2bac754d868b3d6502eac4257658d4b", "url": "https://github.com/ziranlang/av1.git" }, + { + "commit": "9ee24b3f70b9c7d776dc391cba15ba97533db227", + "dependencies": {"kryon": "p09ea4e5550e9f459"}, + "dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"}, + "id": "p6269d7141b731fe4", + "name": "Css", + "ref": "9ee24b3f70b9c7d776dc391cba15ba97533db227", + "url": "https://github.com/kryonlabs/css.git" + }, { "commit": "360553150917f352e49e1beb78917370792ccaef", "dependencies": {}, @@ -170,6 +170,15 @@ "source": true, "url": "https://aomedia.googlesource.com/aom" }, + { + "commit": "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e", + "dependencies": {"kryon": "p09ea4e5550e9f459"}, + "dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"}, + "id": "p8044712e51631874", + "name": "plot", + "ref": "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e", + "url": "https://github.com/kryonlabs/plot.git" + }, { "commit": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "dependencies": {"crypto": "pc23fbf455e97614d", "oqs": "p7098ac9cd92f7e5f"}, @@ -224,6 +233,15 @@ "source": true, "url": "https://github.com/videolan/dav1d.git" }, + { + "commit": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279", + "dependencies": {"curl": "p8da229d15597ab5c", "kryon": "p09ea4e5550e9f459", "mesh_client": "p8204ae87a845c1c3", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"}, + "dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"}, + "id": "pb3958804740a96f2", + "name": "Entity", + "ref": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279", + "url": "https://github.com/waozixyz/entity.git" + }, { "commit": "58626f682afbc2e3467e8c2e5b37f7f29d89ed99", "dependencies": {}, @@ -233,15 +251,6 @@ "source": true, "url": "https://github.com/sqlite/sqlite.git" }, - { - "commit": "0f4f3938fe6066b96539fa3a914b4f2e2425265b", - "dependencies": {"curl": "p8da229d15597ab5c", "kryon": "p076741f1d5f9be83", "mesh_client": "p8204ae87a845c1c3", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "qrcode": "p0dfa70137405b096", "zlib": "p82dbc05081cd4d96"}, - "dependency_refs": {"curl": "19b299005fbe2d895f4ad525cfdae62a2220c3ea", "kryon": "1774e55057346b1c2fe10c211dc87eee29d3adcb", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "monocypher": "master", "oqs": "master", "qrcode": "master", "zlib": "51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf"}, - "id": "pb83ba2a2e1c9c63d", - "name": "Entity", - "ref": "0f4f3938fe6066b96539fa3a914b4f2e2425265b", - "url": "https://github.com/waozixyz/entity.git" - }, { "commit": "944826f70779a6b6cd53f6b06a75b36f4d8a2558", "dependencies": {}, @@ -250,6 +259,15 @@ "ref": "master", "url": "https://github.com/ziranlang/crypto.git" }, + { + "commit": "fcacb49c1e128e9eb100884e6029b24b4e608d38", + "dependencies": {"kryon": "p09ea4e5550e9f459"}, + "dependency_refs": {"kryon": "8d5d2e752a219674f993473c8410847ba42fad48"}, + "id": "pcad095808686987d", + "name": "Game2D", + "ref": "fcacb49c1e128e9eb100884e6029b24b4e608d38", + "url": "https://github.com/kryonlabs/game2d.git" + }, { "commit": "9cc6872f75447c3a24c16764f9829d0f58751cb0", "dependencies": {}, @@ -267,24 +285,6 @@ "source": true, "url": "https://github.com/xiph/opus.git" }, - { - "commit": "96b21e0e45967bb13e16ed72cc797d0b16c1a56d", - "dependencies": {"kryon": "p076741f1d5f9be83"}, - "dependency_refs": {"kryon": "1774e55057346b1c2fe10c211dc87eee29d3adcb"}, - "id": "pecf9c55a2ac283ea", - "name": "Game2D", - "ref": "96b21e0e45967bb13e16ed72cc797d0b16c1a56d", - "url": "https://github.com/kryonlabs/game2d.git" - }, - { - "commit": "764f24b48b49d4b4df029dcce9c1f21153a27fab", - "dependencies": {"crypto": "pc23fbf455e97614d", "kryon": "p076741f1d5f9be83", "mesh_client": "p8204ae87a845c1c3"}, - "dependency_refs": {"crypto": "master", "kryon": "1774e55057346b1c2fe10c211dc87eee29d3adcb", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449"}, - "id": "ped2c51b35661209b", - "name": "Apps", - "ref": "764f24b48b49d4b4df029dcce9c1f21153a27fab", - "url": "https://github.com/waozixyz/apps.git" - }, { "commit": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d", "dependencies": {}, @@ -296,13 +296,13 @@ } ], "root": { - "dependencies": {"apps": "ped2c51b35661209b", "arcade": "p3bbb7ef5867e6b62", "audio": "p59deb49c7f103127", "crypto": "pc23fbf455e97614d", "css": "p35ab9177ed5d22ac", "curl": "p739f5b821e102505", "entity": "pb83ba2a2e1c9c63d", "game2d": "pecf9c55a2ac283ea", "kryon": "p076741f1d5f9be83", "liboqs": "p5c52c96443a2bf32", "mesh_client": "p8204ae87a845c1c3", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "p22f6dd89a47ff56a", "practices": "pf6b6695162f3781e", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "pb6abbb780a670e17"}, - "dependency_refs": {"apps": "764f24b48b49d4b4df029dcce9c1f21153a27fab", "arcade": "712e99ed57a0b1f03ddb21dcd02d9ecd8b7d82e7", "audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "crypto": "master", "css": "6aa491e34997a59577094d81da5361eb8be8b5f4", "curl": "master", "entity": "0f4f3938fe6066b96539fa3a914b4f2e2425265b", "game2d": "96b21e0e45967bb13e16ed72cc797d0b16c1a56d", "kryon": "1774e55057346b1c2fe10c211dc87eee29d3adcb", "liboqs": "7bf154f197696f5bf04be2ea4c576db86bb6a238", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "be13b17487789055b3bfa176035237e6b59f56df", "practices": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d", "qrcode": "master", "rini": "main", "sqlite": "master"}, + "dependencies": {"apps": "p333db0ddd841f1ec", "arcade": "p3bbb7ef5867e6b62", "audio": "p59deb49c7f103127", "crypto": "pc23fbf455e97614d", "css": "p6269d7141b731fe4", "curl": "p739f5b821e102505", "entity": "pb3958804740a96f2", "game2d": "pcad095808686987d", "kryon": "p09ea4e5550e9f459", "liboqs": "p5c52c96443a2bf32", "mesh_client": "p8204ae87a845c1c3", "mingcute": "pe1027b9d16704793", "monocypher": "p002f6ed23e3a3576", "oqs": "p7098ac9cd92f7e5f", "plot": "p8044712e51631874", "practices": "pf6b6695162f3781e", "qrcode": "p0dfa70137405b096", "rini": "p8ea355e8cb04093e", "sqlite": "pb6abbb780a670e17"}, + "dependency_refs": {"apps": "b95d19334ab4338d3611ec9d44db62b50694e464", "arcade": "712e99ed57a0b1f03ddb21dcd02d9ecd8b7d82e7", "audio": "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2", "crypto": "master", "css": "9ee24b3f70b9c7d776dc391cba15ba97533db227", "curl": "master", "entity": "fc8f3d899dfc3d3e0b535006526485c6d8c8c279", "game2d": "fcacb49c1e128e9eb100884e6029b24b4e608d38", "kryon": "8d5d2e752a219674f993473c8410847ba42fad48", "liboqs": "7bf154f197696f5bf04be2ea4c576db86bb6a238", "mesh_client": "c1ac6095d01bcfdd4c5ae49c4636aaf9a0303449", "mingcute": "master", "monocypher": "master", "oqs": "master", "plot": "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e", "practices": "893e5b6f58aae7450a5f68ec153cfe1ee3f84c8d", "qrcode": "master", "rini": "main", "sqlite": "master"}, "name": "Inbe" }, "toolchain": { - "commit": "0c4465a461df0bba473cf249ed30e60d94a6d364", - "ref": "0c4465a461df0bba473cf249ed30e60d94a6d364", + "commit": "55b0176800d42c829db098a2ef8b0705ea339509", + "ref": "55b0176800d42c829db098a2ef8b0705ea339509", "url": "https://github.com/ziranlang/ziran.git" } } diff --git a/ziran.toml b/ziran.toml index 8007dd66c..24c6d767f 100644 --- a/ziran.toml +++ b/ziran.toml @@ -5,11 +5,11 @@ module_roots = ["src", "src/apps", "src/app", "src/core", "src/habits", "src/pra [toolchain] git = "https://github.com/ziranlang/ziran.git" -ref = "0c4465a461df0bba473cf249ed30e60d94a6d364" +ref = "55b0176800d42c829db098a2ef8b0705ea339509" [dependencies.kryon] git = "https://github.com/kryonlabs/kryon.git" -ref = "1774e55057346b1c2fe10c211dc87eee29d3adcb" +ref = "8d5d2e752a219674f993473c8410847ba42fad48" # Ogg Opus for Ziran's std audio, at the commit Kryon locks. [dependencies.audio] @@ -18,7 +18,7 @@ ref = "1b2f35b7b39df6fb9af7a52324b4b7cf18e98df2" [dependencies.css] git = "https://github.com/kryonlabs/css.git" -ref = "6aa491e34997a59577094d81da5361eb8be8b5f4" +ref = "9ee24b3f70b9c7d776dc391cba15ba97533db227" [dependencies.oqs] git = "https://github.com/ziranlang/oqs.git" @@ -26,7 +26,7 @@ ref = "master" [dependencies.game2d] git = "https://github.com/kryonlabs/game2d.git" -ref = "96b21e0e45967bb13e16ed72cc797d0b16c1a56d" +ref = "fcacb49c1e128e9eb100884e6029b24b4e608d38" [dependencies.mesh_client] git = "https://github.com/ziranlang/mesh-client.git" @@ -63,7 +63,7 @@ ref = "master" [dependencies.plot] git = "https://github.com/kryonlabs/plot.git" -ref = "be13b17487789055b3bfa176035237e6b59f56df" +ref = "2b971b1bbd26c7ce452a42b336c80d8a1d2c131e" [dependencies.mingcute] git = "https://github.com/kryonlabs/mingcute.git" @@ -71,7 +71,7 @@ ref = "master" [dependencies.entity] git = "https://github.com/waozixyz/entity.git" -ref = "0f4f3938fe6066b96539fa3a914b4f2e2425265b" +ref = "fc8f3d899dfc3d3e0b535006526485c6d8c8c279" [dependencies.crypto] git = "https://github.com/ziranlang/crypto.git" @@ -79,7 +79,7 @@ ref = "master" [dependencies.apps] git = "https://github.com/waozixyz/apps.git" -ref = "764f24b48b49d4b4df029dcce9c1f21153a27fab" +ref = "b95d19334ab4338d3611ec9d44db62b50694e464" # The practices' pictures, course data and recordings (scripts/practice_media.py). [dependencies.practices]