fix(buildtool): Push changelog command should pull origin #49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin. Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone). Also remove the force push; if the origin *has* changed since we fetched a few lines above, let's fail rather than overwrite what's there.
|
@spinnakerbot cherry-pick 1.19 |
spinnakerbot
pushed a commit
that referenced
this pull request
Mar 19, 2020
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin. Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone). Also remove the force push; if the origin *has* changed since we fetched a few lines above, let's fail rather than overwrite what's there.
|
Cherry pick successful: #50 |
spinnakerbot
pushed a commit
that referenced
this pull request
Mar 19, 2020
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin. Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone). Also remove the force push; if the origin *has* changed since we fetched a few lines above, let's fail rather than overwrite what's there.
|
Cherry pick successful: #51 |
spinnakerbot
pushed a commit
that referenced
this pull request
Mar 19, 2020
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin. Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone). Also remove the force push; if the origin *has* changed since we fetched a few lines above, let's fail rather than overwrite what's there.
|
Cherry pick successful: #52 |
ezimanyi
added a commit
that referenced
this pull request
Mar 19, 2020
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin. Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone). Also remove the force push; if the origin *has* changed since we fetched a few lines above, let's fail rather than overwrite what's there. Co-authored-by: Eric Zimanyi <ezimanyi@google.com>
ezimanyi
added a commit
that referenced
this pull request
Mar 19, 2020
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin. Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone). Also remove the force push; if the origin *has* changed since we fetched a few lines above, let's fail rather than overwrite what's there. Co-authored-by: Eric Zimanyi <ezimanyi@google.com>
ezimanyi
added a commit
that referenced
this pull request
Mar 19, 2020
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin. Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone). Also remove the force push; if the origin *has* changed since we fetched a few lines above, let's fail rather than overwrite what's there. Co-authored-by: Eric Zimanyi <ezimanyi@google.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was trying to figure out why any manual changes I made to the raw changelog (notably deleting the no-longer-needed 1.14, 1.15, 1.16 entries) were disappearing. It turns out that while we fetch the origin commit, we don't do anything with it, and commit on top of what's currently on the jenkins machine, then force push that to the origin.
Instead, just reset master to origin/master before making any changes. There should not be any local changes in this directory; if there are, it would be from an error in some prior run, and we'd rather just start fresh (as we do in the first block where we just clone).
Also remove the force push; if the origin has changed since we fetched a few lines above, let's fail rather than overwrite what's there.