Bump version to 0.21.0-dev.0; fix post-release sync skip - #412
Merged
Conversation
First version on the new -dev.N pre-release line (replacing -alpha.N as of release 0.20.0). Also fixes sync-develop-from-main to skip only when main is already an ancestor of develop: the old tree-diff skip fired right after every release (merge result content-identical to develop), so the workflow never pushed the ancestry-advancing merge commit or rolled develop's VERSION forward — both had to be done by hand. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
andrewjong
added a commit
that referenced
this pull request
Aug 29, 2026
… trees (#413) Backport of the sync-develop-from-main fix from develop (#412) so it is live for the 0.21.0 release: push-triggered workflows run from main's copy of the file. Skip now requires main to already be an ancestor of develop — a tree-diff skip fired right after every release (merge result content-identical to develop), so the ancestry-advancing merge commit was never pushed and develop's VERSION never rolled forward. VERSION 0.20.0 → 0.20.1 (CI-only change; bump required by the PR gate). Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Contributor
Test Metrics —
|
| Test | Pass | Fail | Skip | Rate |
|---|---|---|---|---|
| test_colcon_build_gcs | 1 | 0 | 0 | 100% |
| test_colcon_build_ms_airsim | 1 | 0 | 0 | 100% |
| test_colcon_build_robot | 1 | 0 | 0 | 100% |
| test_colcon_test_robot | 1 | 0 | 0 | 100% |
Metrics
| Test | Metric | Value |
|---|---|---|
| test_colcon_build_robot | duration_s | 104.8s |
| test_colcon_test_robot | duration_s | 47.24s |
| test_colcon_build_gcs | duration_s | 74.05s |
| test_colcon_build_ms_airsim | duration_s | 16.59s |
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
1 participant
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.
Post-release follow-up to 0.20.0 (released: https://github.com/castacks/AirStack/releases/tag/0.20.0):
0.21.0-dev.0— first version on the new-dev.Npre-release line (replacing-alpha.N). Develop is otherwise code-identical to the 0.20.0 release.airstack.yaml's informationalrelease:field →"0.21.0-dev".sync-develop-from-mainskip logic — it skipped whenever the merge result was content-identical to develop, which is exactly the situation right after a release, so it never pushed the ancestry-advancing merge commit or rolled develop's VERSION forward (this release's sync run skipped exactly this way; Re-establish main↔develop ancestry for release 0.20.0 #411 and this PR are the manual stand-ins). It now skips only when main is already an ancestor of develop, so future releases get the merge-base advance and the-dev.0roll-forward automatically.Squash-merging this one is fine.
🤖 Generated with Claude Code