Update release script #465
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
script/release.sh
Outdated
|
|
||
| git_sync() { | ||
| cd $CLI | ||
| git pull origin |
There was a problem hiding this comment.
I'm not sure about this :-(
Isn't origin pointing to fork? It should pull from upstream no?
There was a problem hiding this comment.
Ah yeah, you're right. Should be pulling from upstream.
cdrage
force-pushed
the
update-release-script-resync
branch
from
04f37fe
to
15fe66d
Compare
|
@kadel Updated :) |
script/release.sh
Outdated
| @@ -71,6 +71,7 @@ clone() { | |||
| cd $CLI | |||
| git remote remove origin | |||
| git remote add origin git@github.com:$ORIGIN_REPO/$CLI.git | |||
| git remote add upstream git@github.com:$UPSTREAM_REPO/$CLI.git | |||
There was a problem hiding this comment.
Can we maybe https instead of ssh? It will prevent accidental pushes to upstream.
There was a problem hiding this comment.
I'd prefer it SSH to be honest... Having to enter http credentials each-time is a kill-joy. I have no arguments to say that ssh is any better haha. Just personal preference of mine.
There was a problem hiding this comment.
But you never push to upstream.
This is why I suggested https, so auth prompt pops-up and you know that you are pushing to wrong remote.
There was a problem hiding this comment.
Ahhhhh, I get it. So https for upstream and ssh for origin and then we have the best of both-worlds.
script/release.sh
Outdated
|
|
||
| git_sync() { | ||
| cd $CLI | ||
| git pull upstream |
There was a problem hiding this comment.
I still think this won't work. You should also specify branch.
git pull upstream master I would probably use fetch here. git fetch upstream master
There was a problem hiding this comment.
Hmm. It should work, I just tested it out and it pulled an updated branch of gh-pages I recently commited to. I'll update the script!
There was a problem hiding this comment.
I've tried and got:
You asked to pull from the remote 'upstream', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
15fe66d
to
55e9236
Compare
Had an issue where I don't git pull / merge with master after the PR has been merged. This adds an option to sync with master before continuing.
cdrage
force-pushed
the
update-release-script-resync
branch
from
55e9236
to
4e3b1c3
Compare
Had an issue where I don't git pull / merge with master after the PR has
been merged.
This adds an option to sync with master before continuing.