revert untouched files

This commit is contained in:
Kurnianto Trilaksono
2024-03-27 23:56:57 +08:00
parent 846d3c09eb
commit 3d840a6584
2 changed files with 2 additions and 11 deletions

View File

@@ -258,8 +258,7 @@ func (gr *Runner) AssureOnMainBranch() error {
// CheckoutMainBranch does that.
func (gr *Runner) CheckoutMainBranch() error {
gr.comment("checking out main branch")
fullBranchSpec := fmt.Sprintf("%s/%s", remoteOrigin, mainBranch)
return gr.runNoOut(noHarmDone, "checkout", fullBranchSpec)
return gr.runNoOut(noHarmDone, "checkout", mainBranch)
}
// FetchRemote does that.

View File

@@ -2,20 +2,12 @@
# Copyright 2022 The Kubernetes Authors.
# SPDX-License-Identifier: Apache-2.0
ORIGIN_MASTER="feat/5449-add-release-automation"
UPSTREAM_REPO="upstream"
UPSTREAM_MASTER="master"
function createBranch {
branch=$1
title=$2
echo "Making branch $branch : \"$title\""
# Check if release branch exists
if git show-ref --quiet "refs/heads/${branch}"; then
git fetch --tags upstream master
git checkout $ORIGIN_MASTER
git branch -D $branch # delete if it exists
fi
git branch -D $branch # delete if it exists
git checkout -b $branch
git commit -a -m "$title"
git push -f origin $branch