Skip to content

ci: push tags and skip unnecessary rebases in sync workflow #9

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
RoyalOughtness merged 2 commits into from
Oct 4, 2025
Merged

ci: push tags and skip unnecessary rebases in sync workflow #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
316bdbe
ci: push merged lightweight tags in sync workflow
HastD Oct 4, 2025
ad4e0e4
ci: skip unnecessary rebases in sync workflow
HastD Oct 4, 2025
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
18 changes: 16 additions & 2 deletions .github/workflows/upstream-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,19 @@ jobs:

spec_url="https://src.fedoraproject.org/rpms/selinux-policy/raw/f${FEDORA_VERSION}/f/selinux-policy.spec"
stable_commit=$(curl -Ls "${spec_url}" | grep -E '^%global commit [0-9a-fA-F]+$')
git rebase "${stable_commit#%global commit }"
git push --follow-tags --force-with-lease
stable_commit="${stable_commit#%global commit }"
set +e
git merge-base --is-ancestor "${stable_commit}" HEAD
status=$?
set -e
case "${status}" in
0) ;;
1)
git rebase "${stable_commit}"
git push --follow-tags --force-with-lease
;;
*) exit "${status}" ;;
esac

readarray -t merged_tags < <(git tag -l "v${FEDORA_VERSION}.*" --merged)
git push origin "${merged_tags[@]}"