fix: support multiple dependency git mappings - #475
Merged
Conversation
As seen in https://github.com/eclipse-zenoh/ci/actions/runs/32243126985/job/96105227398 when set-git-branch action tries to update zenoh-flat-jni dependencies, it should skip zenoh-flat and leave it unchanged.
diogomatsubara
marked this pull request as draft
August 25, 2026 08:54
diogomatsubara
changed the title
diogomatsubara
marked this pull request as ready for review
August 25, 2026 09:43
milyin
approved these changes
Aug 25, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the set-git-branch GitHub Action to support multiple dependency regex → git URL/branch mappings, enabling correct rewriting when a workspace depends on more than one zenoh-related repository (e.g., zenoh and zenoh-flat).
Changes:
- Replace single
deps-*inputs with multiline lists and parse them into aligned dependency mappings. - Apply each mapping when scanning
Cargo.tomlfiles (loop over mappings per manifest). - Add unit tests for dependency mapping parsing and update the merge workflow to provide two mappings (
zenoh*andzenoh-flat).
Reviewed changes
Copilot reviewed 4 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
src/set-git-branch.ts |
Introduces Dependency[] parsing and applies multiple mappings while updating Cargo manifests. |
set-git-branch/action.yml |
Documents the deps-* inputs as multiline lists. |
dist/set-git-branch-main.mjs |
Updates the bundled action output to match the new multiline parsing logic. |
.github/workflows/merge-release-branch.yml |
Switches workflow inputs to provide two dependency mappings for zenoh and zenoh-flat. |
__tests__/set-git-branch.test.ts |
Adds tests for parseDependencies. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
1.10.0release introducedzenoh-flatas dependency forzenoh-flat-jnirepo. This PR updatesset-git-branchaction to allow the correct url/branch to be set to the right repository.Fix https://github.com/eclipse-zenoh/ci/actions/runs/32243126985/job/96105227398.