hotfix(ci): make the fixed post-release sync live on main - #413
Merged
Conversation
… trees 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 | 98.87s |
| test_colcon_test_robot | duration_s | 45.41s |
| test_colcon_build_gcs | duration_s | 69.81s |
| test_colcon_build_ms_airsim | duration_s | 16.89s |
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.
Backports the
sync-develop-from-mainskip-logic fix from develop (#412) onto main, so it's live before the 0.21.0 release — push-triggered workflows run from main's copy of the workflow file, so without this the fix wouldn't take effect until the release after next..github/workflows/sync-develop-from-main.yaml: byte-identical copy of develop's fixed version (skip only when main is already an ancestor of develop, instead of the tree-diff check that fired right after every release)..env:0.20.0→0.20.1(CI-only change; the bump is required by the version gate). develop stays strictly greater at0.21.0-dev.0.Deliberately excludes release-notes edits so the automatic sync merge back into develop cannot conflict (the workflow auto-resolves
.envby keeping develop's side; the workflow file matches develop's exactly).Squash-merge is fine (satisfies linear history). Merging this will trigger the first live run of the fixed sync: expect it to merge main into develop and auto-bump develop to
0.21.0-dev.1(hotfix path).🤖 Generated with Claude Code