This repository has been archived by the owner on Jan 22, 2020. It is now read-only.
Fix publish script #103
Merged
Fix publish script #103
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
Previously, the publish script would be unable to `git checkout` away from the `staging` branch after `bin/problemify` was run. This commit fixes the issue by copying the entire directory (minus `.git/` and `node_modules/`) into `tmp/`. As the `tmp/` directory is not tracked by `git`, we are able to safely `git checkout` to `master` (or `solution`) without any errors. This commit also changes how the latest work is pulled from the upstream branches. Rather than using `git pull`, the script now does a `git checkout` on the upstream branches, then forces the local reference to the branch to match wherever the upstream branch is pointing to. This safeguards against scenarios where the local `staging` branch has more work than `upstream/staging`. Signed-off-by: Robin Kim <therobinkim@gmail.com>
therobinkim
force-pushed
the
fix-publish-script
branch
from
1822212
to
e89575f
Compare
delventhalz
approved these changes
Jul 7, 2018
| @@ -19,28 +19,42 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../" | |||
| CURR_BRANCH="$( git rev-parse --abbrev-ref HEAD )" | |||
|
|
|||
| # Pull new staging code | |||
| # when testing, use `git checkout origin/staging` | |||
There was a problem hiding this comment.
Not sure if we should include these comments. In theory it should be tested, and if someone can't figure out to switch it to origin when they need to test it, they probably shouldn't be running this script.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #102.
This PR requires a little work to test as the changes in the PR actually rely on the current status of
hyperledger:staging(and until this PR is merged... the changes won't be onhyperledger:staging).So, I've tested it out on my own fork! Here are the commits that the script produced:
We will be able to more accurately test this PR once it's been merged (which is a bit unfortunate).