Skip to content

Commit

Permalink
Merge pull request tektoncd#627 from pradeepitm12/fix-master-main-ci
Browse files Browse the repository at this point in the history
change master to main for upstream
  • Loading branch information
openshift-merge-robot authored Mar 15, 2021
2 parents 313072d + 7525371 commit 8faaaee
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions openshift/release/update-to-head.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ REPO_NAME=`basename $(git rev-parse --show-toplevel)`
TODAY=`date "+%Y%m%d"`
OPENSHIFT_REMOTE=${OPENSHIFT_REMOTE:-openshift}

# Reset release-next to upstream/master.
git fetch upstream master
git checkout upstream/master --no-track -B release-next
# Reset release-next to upstream/main.
git fetch upstream main
git checkout upstream/main --no-track -B release-next

# Update openshift's master and take all needed files from there.
git fetch ${OPENSHIFT_REMOTE} master
Expand Down

0 comments on commit 8faaaee

Please sign in to comment.