Skip to content

hotfix(ci): make the fixed post-release sync live on main #413

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
andrewjong merged 1 commit into from
Aug 29, 2026
Merged

hotfix(ci): make the fixed post-release sync live on main #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PROJECT_NAME="airstack"
# If you've run ./airstack.sh setup, then this will auto-generate from the git commit hash every time a change is made
# to a Dockerfile or docker-compose.yaml file. Otherwise this can also be set explicitly to make a release version.
# auto-generated from git commit hash
VERSION="0.20.0"
VERSION="0.20.1"
# Image-tag discriminator ONLY (appears in the image tag suffix, e.g. ..._robot-x86-64_dev).
# No Dockerfile consumes it: "prebuilt" does NOT bake the built ros_ws into the image today —
# a real prebuilt (workspace-baked) stage is future work. Keep "dev" (mounted code, built live).
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/sync-develop-from-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,14 @@ jobs:
git -c core.editor=true commit --no-edit
fi

# If develop already contained everything main has, nothing to do.
if git diff --quiet origin/develop..HEAD; then
echo "develop already up to date with main; nothing to sync."
# Skip only when main is already in develop's ancestry. A tree
# diff is the wrong check here: right after a release, the merge
# result is content-identical to develop, but the merge commit
# must still be pushed (it advances the develop↔main merge base,
# preventing spurious conflicts on the next release PR) and the
# VERSION roll-forward below must still happen.
if git merge-base --is-ancestor origin/main origin/develop; then
echo "main is already an ancestor of develop; nothing to sync."
echo "SKIP=true" >> $GITHUB_ENV
fi

Expand Down
Loading