build-and-update-all-branches: s/master/main/ take #2

This commit is contained in:
Pavel Raiskup 2021-11-28 23:42:50 +01:00
parent b4fbd963a5
commit b9fc08e607

View File

@ -3,11 +3,12 @@
# Prepare master branch, review the list of branches below and then execute this # Prepare master branch, review the list of branches below and then execute this
# script. # script.
branches='rawhide epel7 epel8 f33 f34 f35' main=rawhide
branches="$main epel7 epel8 f33 f34 f35"
exit_handler () exit_handler ()
{ {
git checkout master git checkout "$main"
} }
trap exit_handler EXIT trap exit_handler EXIT
@ -19,9 +20,9 @@ koji hello
tasks= tasks=
for branch in $branches; do for branch in $branches; do
if test $branch != master; then if test $branch != "$main"; then
git checkout "$branch" git checkout "$branch"
git merge master git merge "$main"
fi fi
git push git push
tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`" tasks="${tasks}`fedpkg build --nowait | grep 'Created task' | cut -d: -f2`"