Skip to content

Realign the binding with zenoh-flat HEAD #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
milyin merged 6 commits into from
Jul 28, 2026
Merged

Realign the binding with zenoh-flat HEAD #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4db5fb1
Realign the binding with zenoh-flat HEAD
milyin Jul 27, 2026
a0c2ae2
Regenerate against prebindgen main
milyin Jul 27, 2026
116480c
Regenerate: byte-backed values now compare by content
milyin Jul 27, 2026
43aee33
ZenohId is an ordinary data class
milyin Jul 27, 2026
5e0ae50
CI: one prebindgen main per run, and don't cache a stale generator
milyin Jul 27, 2026
7f96431
CI: restore the target cache restore-keys
milyin Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 56 additions & 17 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,32 @@ on:
env:
RUST_BACKTRACE: 1
CARGO_TERM_COLOR: always
# zenoh-flat remains a sibling path dependency until it is published.
ZENOH_FLAT_REF: 3f431b6b581c49b6c4d0e94fab5922f860a98205

jobs:
# prebindgen tracks `main`, but every job in a run must see the *same* main:
# resolving it per-job lets a merge land mid-run and give two jobs different
# generators. Resolve once here, and pin the jobs to that exact commit.
resolve-prebindgen:
name: Resolve prebindgen main
runs-on: ubuntu-latest
outputs:
sha: ${{ steps.rev.outputs.sha }}
steps:
- name: Resolve prebindgen main to a commit
id: rev
shell: bash
run: |
sha=$(git ls-remote https://github.com/milyin/prebindgen.git refs/heads/main | cut -f1)
test -n "$sha" || { echo "could not resolve prebindgen main"; exit 1; }
echo "prebindgen main = $sha"
echo "sha=$sha" >> "$GITHUB_OUTPUT"

lint:
name: Lint
runs-on: ubuntu-latest
needs: resolve-prebindgen
defaults:
run:
working-directory: zenoh-flat-jni
Expand All @@ -22,22 +43,24 @@ jobs:
with:
path: zenoh-flat-jni

# zenoh-flat remains a sibling path dependency until it is published.
- name: Check out zenoh-flat
uses: actions/checkout@v4
with:
repository: ZettaScaleLabs/zenoh-flat
ref: 5ffb957b1f18c26be183fe3bf22a08ba93575f12
ref: ${{ env.ZENOH_FLAT_REF }}
path: zenoh-flat

- name: Use prebindgen from GitHub main
shell: bash
env:
PREBINDGEN_SHA: ${{ needs.resolve-prebindgen.outputs.sha }}
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 "s|prebindgen = { path = \"../prebindgen/prebindgen\" }|prebindgen = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\" }|g" \
-e "s|prebindgen-proc-macro = { path = \"../prebindgen/prebindgen-proc-macro\",|prebindgen-proc-macro = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\",|g" \
Cargo.toml ../zenoh-flat/Cargo.toml
rm Cargo.toml.bak ../zenoh-flat/Cargo.toml.bak
grep -n prebindgen Cargo.toml ../zenoh-flat/Cargo.toml

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -65,8 +88,9 @@ jobs:
uses: actions/cache@v4
with:
path: zenoh-flat-jni/target
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('zenoh-flat-jni/Cargo.toml', 'zenoh-flat-jni/Cargo.lock', 'zenoh-flat/Cargo.lock') }}
key: ${{ runner.os }}-cargo-build-target-${{ env.ZENOH_FLAT_REF }}-${{ needs.resolve-prebindgen.outputs.sha }}
restore-keys: |
${{ runner.os }}-cargo-build-target-${{ env.ZENOH_FLAT_REF }}-
${{ runner.os }}-cargo-build-target-

- name: Run format check
Expand All @@ -78,6 +102,7 @@ jobs:
test:
name: Test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
needs: resolve-prebindgen
defaults:
run:
working-directory: zenoh-flat-jni
Expand All @@ -93,17 +118,20 @@ jobs:
uses: actions/checkout@v4
with:
repository: ZettaScaleLabs/zenoh-flat
ref: 5ffb957b1f18c26be183fe3bf22a08ba93575f12
ref: ${{ env.ZENOH_FLAT_REF }}
path: zenoh-flat

- name: Use prebindgen from GitHub main
shell: bash
env:
PREBINDGEN_SHA: ${{ needs.resolve-prebindgen.outputs.sha }}
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 "s|prebindgen = { path = \"../prebindgen/prebindgen\" }|prebindgen = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\" }|g" \
-e "s|prebindgen-proc-macro = { path = \"../prebindgen/prebindgen-proc-macro\",|prebindgen-proc-macro = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\",|g" \
Cargo.toml ../zenoh-flat/Cargo.toml
rm Cargo.toml.bak ../zenoh-flat/Cargo.toml.bak
grep -n prebindgen Cargo.toml ../zenoh-flat/Cargo.toml

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
Expand Down Expand Up @@ -136,8 +164,9 @@ jobs:
uses: actions/cache@v4
with:
path: zenoh-flat-jni/target
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('zenoh-flat-jni/Cargo.toml', 'zenoh-flat-jni/Cargo.lock', 'zenoh-flat/Cargo.lock') }}
key: ${{ runner.os }}-cargo-build-target-${{ env.ZENOH_FLAT_REF }}-${{ needs.resolve-prebindgen.outputs.sha }}
restore-keys: |
${{ runner.os }}-cargo-build-target-${{ env.ZENOH_FLAT_REF }}-
${{ runner.os }}-cargo-build-target-

- name: Run tests
Expand All @@ -146,6 +175,7 @@ jobs:
gradle-test:
name: Gradle test on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
needs: resolve-prebindgen
defaults:
run:
working-directory: zenoh-flat-jni
Expand All @@ -161,17 +191,20 @@ jobs:
uses: actions/checkout@v4
with:
repository: ZettaScaleLabs/zenoh-flat
ref: 5ffb957b1f18c26be183fe3bf22a08ba93575f12
ref: ${{ env.ZENOH_FLAT_REF }}
path: zenoh-flat

- name: Use prebindgen from GitHub main
shell: bash
env:
PREBINDGEN_SHA: ${{ needs.resolve-prebindgen.outputs.sha }}
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 "s|prebindgen = { path = \"../prebindgen/prebindgen\" }|prebindgen = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\" }|g" \
-e "s|prebindgen-proc-macro = { path = \"../prebindgen/prebindgen-proc-macro\",|prebindgen-proc-macro = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\",|g" \
Cargo.toml ../zenoh-flat/Cargo.toml
rm Cargo.toml.bak ../zenoh-flat/Cargo.toml.bak
grep -n prebindgen Cargo.toml ../zenoh-flat/Cargo.toml

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
Expand All @@ -193,8 +226,9 @@ jobs:
uses: actions/cache@v4
with:
path: zenoh-flat-jni/target
key: ${{ runner.os }}-gradle-test-target-${{ hashFiles('zenoh-flat-jni/Cargo.toml', 'zenoh-flat-jni/Cargo.lock', 'zenoh-flat/Cargo.lock') }}
key: ${{ runner.os }}-gradle-test-target-${{ env.ZENOH_FLAT_REF }}-${{ needs.resolve-prebindgen.outputs.sha }}
restore-keys: |
${{ runner.os }}-gradle-test-target-${{ env.ZENOH_FLAT_REF }}-
${{ runner.os }}-gradle-test-target-

# Runs the Kotlin correspondence tests: each verifies a pure-Kotlin
Expand All @@ -208,6 +242,7 @@ jobs:
build:
name: Build on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
needs: resolve-prebindgen
defaults:
run:
working-directory: zenoh-flat-jni
Expand All @@ -223,17 +258,20 @@ jobs:
uses: actions/checkout@v4
with:
repository: ZettaScaleLabs/zenoh-flat
ref: 5ffb957b1f18c26be183fe3bf22a08ba93575f12
ref: ${{ env.ZENOH_FLAT_REF }}
path: zenoh-flat

- name: Use prebindgen from GitHub main
shell: bash
env:
PREBINDGEN_SHA: ${{ needs.resolve-prebindgen.outputs.sha }}
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 "s|prebindgen = { path = \"../prebindgen/prebindgen\" }|prebindgen = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\" }|g" \
-e "s|prebindgen-proc-macro = { path = \"../prebindgen/prebindgen-proc-macro\",|prebindgen-proc-macro = { git = \"https://github.com/milyin/prebindgen.git\", rev = \"$PREBINDGEN_SHA\",|g" \
Cargo.toml ../zenoh-flat/Cargo.toml
rm Cargo.toml.bak ../zenoh-flat/Cargo.toml.bak
grep -n prebindgen Cargo.toml ../zenoh-flat/Cargo.toml

- name: Install Rust
uses: dtolnay/rust-toolchain@stable
Expand All @@ -244,8 +282,9 @@ jobs:
uses: actions/cache@v4
with:
path: zenoh-flat-jni/target
key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('zenoh-flat-jni/Cargo.toml', 'zenoh-flat-jni/Cargo.lock', 'zenoh-flat/Cargo.lock') }}
key: ${{ runner.os }}-cargo-build-target-${{ env.ZENOH_FLAT_REF }}-${{ needs.resolve-prebindgen.outputs.sha }}
restore-keys: |
${{ runner.os }}-cargo-build-target-${{ env.ZENOH_FLAT_REF }}-
${{ runner.os }}-cargo-build-target-

- name: Build release
Expand Down
Loading
Loading