From 9a90b3df3c4aa396ceb3848716f96308b865c8d6 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Thu, 6 Aug 2026 23:41:46 +0200 Subject: [PATCH 1/4] CI: track zenoh-flat-jni onto the split prebindgen crates zenoh-flat-jni#23 replaces its single `prebindgen` dependency with the three crates the #371 split produced, so this workflow's two hardcoded per-crate rewrites no longer match anything: the path deps would survive into a checkout that has no sibling `../prebindgen`. One regex over every `../prebindgen/*` dep covers the split and whatever it grows next. The pinned checkouts also move from the stale ZettaScaleLabs forks (last pushed in July) to the eclipse-zenoh repositories the work actually lives in, at the two open PR heads. No Kotlin change: zenoh-flat-jni regenerates byte-identical Kotlin over the split, and all 112 jvmTest cases pass against it locally. --- .github/workflows/ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f92c608f..373879a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,15 +30,17 @@ jobs: - name: Check out zenoh-flat-jni uses: actions/checkout@v4 with: - repository: ZettaScaleLabs/zenoh-flat-jni - ref: 498ba268cf314b38bdca3faa131c2ee8402b2ac4 + repository: eclipse-zenoh/zenoh-flat-jni + # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat-jni#23 merges. + ref: 227f2663b81f0dae3af15de38cd729ec29eac931 path: zenoh-flat-jni - name: Check out zenoh-flat uses: actions/checkout@v4 with: - repository: ZettaScaleLabs/zenoh-flat - ref: 3f431b6b581c49b6c4d0e94fab5922f860a98205 + repository: eclipse-zenoh/zenoh-flat + # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat#79 merges. + ref: 8ca56d2bb9c00617c001928bf9b2bc564dd62071 path: zenoh-flat - name: Use prebindgen from GitHub main @@ -46,8 +48,7 @@ jobs: working-directory: zenoh-flat-jni run: | sed -i.bak \ - -e 's|prebindgen = { path = "../prebindgen/prebindgen" }|prebindgen = { git = "https://github.com/milyin/prebindgen.git", branch = "main" }|g' \ - -e 's|prebindgen-proc-macro = { path = "../prebindgen/prebindgen-proc-macro",|prebindgen-proc-macro = { git = "https://github.com/milyin/prebindgen.git", branch = "main",|g' \ + -E -e 's|(prebindgen[a-z-]*) = \{ path = "\.\./prebindgen/[a-z-]+"|\1 = { git = "https://github.com/milyin/prebindgen.git", branch = "main"|g' \ Cargo.toml ../zenoh-flat/Cargo.toml rm Cargo.toml.bak ../zenoh-flat/Cargo.toml.bak From dd06bfd00caa8cb1828e97e6832b32f674df08c5 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Fri, 7 Aug 2026 16:55:03 +0200 Subject: [PATCH 2/4] CI: drop the prebindgen path rewrite, it is published prebindgen 0.5.0 is on crates.io, so zenoh-flat-jni and zenoh-flat declare version constraints and nothing has to be rewritten before the build. Re-pin both checkouts to the PRs that make that switch. --- .github/workflows/ci.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 373879a0..d73e3bd1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,27 +31,18 @@ jobs: uses: actions/checkout@v4 with: repository: eclipse-zenoh/zenoh-flat-jni - # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat-jni#23 merges. - ref: 227f2663b81f0dae3af15de38cd729ec29eac931 + # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat-jni#25 merges. + ref: bbc47c42ca91cf0578deaa272b6ad2463ae8d51d path: zenoh-flat-jni - name: Check out zenoh-flat uses: actions/checkout@v4 with: repository: eclipse-zenoh/zenoh-flat - # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat#79 merges. - ref: 8ca56d2bb9c00617c001928bf9b2bc564dd62071 + # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat#80 merges. + ref: 936fd00b4b4d6b0e2b3bf8662a275aad4adffe36 path: zenoh-flat - - name: Use prebindgen from GitHub main - shell: bash - working-directory: zenoh-flat-jni - run: | - sed -i.bak \ - -E -e 's|(prebindgen[a-z-]*) = \{ path = "\.\./prebindgen/[a-z-]+"|\1 = { git = "https://github.com/milyin/prebindgen.git", branch = "main"|g' \ - Cargo.toml ../zenoh-flat/Cargo.toml - rm Cargo.toml.bak ../zenoh-flat/Cargo.toml.bak - - uses: actions/setup-java@v4 with: distribution: temurin From 336b4a1f1587e82800d05aaf6db6b5e17ca294e2 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Fri, 7 Aug 2026 17:46:14 +0200 Subject: [PATCH 3/4] CI: re-pin zenoh-flat to main, zenoh-flat-jni to zenoh-flat-jni#24 eclipse-zenoh/zenoh-flat#80 merged as 81feb94. zenoh-flat-jni#25 landed on the #24 branch rather than main, so that checkout tracks #24 now. --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d73e3bd1..daf253f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,16 +31,15 @@ jobs: uses: actions/checkout@v4 with: repository: eclipse-zenoh/zenoh-flat-jni - # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat-jni#25 merges. - ref: bbc47c42ca91cf0578deaa272b6ad2463ae8d51d + # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat-jni#24 merges. + ref: 02feeccadc5add438af85ee64ae941d8ce6b9b38 path: zenoh-flat-jni - name: Check out zenoh-flat uses: actions/checkout@v4 with: repository: eclipse-zenoh/zenoh-flat - # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat#80 merges. - ref: 936fd00b4b4d6b0e2b3bf8662a275aad4adffe36 + ref: 81feb940cce9f4c3b33a87de397b2ce42cb5fc9e path: zenoh-flat - uses: actions/setup-java@v4 From 6884723e3d8589c5e7cd1fe4fc5fdeb836ed0aa8 Mon Sep 17 00:00:00 2001 From: Michael Ilyin Date: Fri, 7 Aug 2026 18:03:55 +0200 Subject: [PATCH 4/4] CI: re-pin zenoh-flat-jni to main eclipse-zenoh/zenoh-flat-jni#24 merged as 6f81eb8; both sibling checkouts now sit on their repositories' main. --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index daf253f7..e83b4ec7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,8 +31,7 @@ jobs: uses: actions/checkout@v4 with: repository: eclipse-zenoh/zenoh-flat-jni - # TODO: re-pin to `main` once eclipse-zenoh/zenoh-flat-jni#24 merges. - ref: 02feeccadc5add438af85ee64ae941d8ce6b9b38 + ref: 6f81eb8f9d5c49b72dda2fb054a174cce3184f2a path: zenoh-flat-jni - name: Check out zenoh-flat