Skip to content
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

Jump to bottom

fix-daily-branch: merge instead of reset #71

Merged
merged 1 commit into from
Jan 14, 2021
Merged

fix-daily-branch: merge instead of reset #71

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 12 additions & 4 deletions scripts/fix-daily-branch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ set -e

error() { echo "$@" 1>&2; }
fail() { [ $# -eq 0 ] || error "$@"; exit 1; }
log() { echo "== $@ =="; }

gitcmd() {
git "$@" || fail "Failed running git $@"
Expand Down Expand Up @@ -35,11 +36,18 @@ drop_cherry_picks_from_daily_branch() {
local source_branch="${remote}/ubuntu/${release}"
local daily_branch="ubuntu/daily/${release}"

log "Checking out and updating daily branch"
gitcmd fetch ${remote}
echo "Backing out all debian/patches/*cpick* from ${daily_branch} branch"
gitcmd checkout -B ${daily_branch} ${source_branch}
gitcmd checkout ${daily_branch}
gitcmd pull ${remote} ${daily_branch}
old_daily_branch_head=$(git rev-parse HEAD)

log "Merging packaging branch (so we can revert patches from it)"
gitcmd merge -m "Merge $release packaging branch to daily branch" ${source_branch}

cpick_files=$( find debian/patches -name "*cpick*")
if [ -n "${cpick_files}" ]; then
log "Backing out all debian/patches/*cpick* from ${daily_branch} branch"
gitcmd log --oneline -- ${cpick_files} | cut -d" " -f1 | xargs git revert
cat <<EOF
To fix daily recipe builds perform the following:
Expand All @@ -49,8 +57,8 @@ To fix daily recipe builds perform the following:
git push ${remote} ${daily_branch}
EOF
else
echo "No fix-daily-branch needed for ${daily_branch}."
echo "No debian/patches/*cpick* files present to revert"
log "No debian/patches/*cpick* files present; no reverts needed, undoing merge"
gitcmd reset --hard $old_daily_branch_head
fi
}

Expand Down