Merged
Conversation
Member
qmonnet
commented
Mar 25, 2026
qmonnet
commented
- ci: Fix bump_minor_version and related workflow
- ci: Fix email value for GitHub App for bump, version-bump workflows
- ci: With version-bump.yml workflow, create bump PRs in draft mode
Fix the "just bump_minor_version" command: The new build framework uses tomlq rather than yq. tomlq vs. yq: I'd like this target to run also outside of the nix-shell as long as the user has any "yq" version available, but in the end it would involve too much juggling for the options and binary names. Given that we need to run "cargo update" as part of the recipe anyway, let's just use the tool from the Nix environment. This also means we no longer need the yq_flags variable. Note: Daniel proposed a fix close to this one in the past, which I rejected because I thought we could still make it work with yq. That's not the case, or not without testing for availability of different yq-related binaries in the justfile, which is not worth it. Along with the just recipe, we remove the flags when calling the recipe from the related GitHub workflow. Fixes: 2a917b5 ("ci: rewrite GitHub workflows for nix-based builds") Reported-by: Sergei Lukianov <me@slukjanov.name> Signed-off-by: Quentin Monnet <qmo@qmon.net>
Pull Requests to bump the dataplane version may be sensitive to the merge order, in particular: it often happens that we want the bump to go in after another set of Pull Requests in preparation have been merged. To avoid over-enthusiastic reviewers to just review and click the green button, create the Pull Requests as draft mode. This way, it's also less surprising to other contributors when someone tests the workflow and opens Pull Requests bumping the version number. Signed-off-by: Quentin Monnet <qmo@qmon.net>
Member
Author
|
Ran successfully (with no version provided as argument for the dispatch) at https://github.com/githedgehog/dataplane/actions/runs/23552482929/job/68570047454, producing #1393 |
qmonnet
requested review from
Copilot and
daniel-noland
and removed request for
a team
qmonnet
commented
Mar 25, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes the automated version bump workflows by aligning the just bump_minor_version implementation with how CI invokes it, updating bot identity email, and ensuring version bump PRs are created as drafts.
Changes:
- Update
just bump_minor_versionto usetomlqdirectly (no TOML flags passed viajust). - Update
git config user.emailin bump-related workflows to the GitHub App bot noreply address. - Create version bump PRs in draft mode via
peter-evans/create-pull-request.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
justfile |
Switch minor-version parsing from yq (with flags) to tomlq for Cargo.toml version extraction. |
.github/workflows/version-bump.yml |
Call the updated just bump_minor_version, update bot email, and create draft PRs. |
.github/workflows/bump.yml |
Update bot email used for dependency bump commits. |
Frostman
approved these changes
Mar 25, 2026
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.