Feature: configurable Nim upstream repo #76
Conversation
gmega
force-pushed
the
feat/configurable-nim-repo
branch
from
2c4bccf to
b6a1ad8
Compare
gmega
force-pushed
the
feat/configurable-nim-repo
branch
from
b6a1ad8 to
fbce6ef
Compare
scripts/build_nim.sh
Outdated
| @@ -64,7 +66,8 @@ nim_needs_rebuilding() { | |||
| if ! git checkout -q ${NIM_COMMIT} 2>/dev/null; then | |||
| # Pay the price for a non-default NIM_COMMIT here, by fetching everything. | |||
| # (This includes upstream branches and tags that might be missing from our fork.) | |||
| git remote add upstream https://github.com/nim-lang/Nim | |||
| git remote remove upstream 2>/dev/null || true | |||
| git remote add upstream "${NIM_COMMIT_REPO_URL}" | |||
There was a problem hiding this comment.
let's add a new remote name for this, if it is set - ie extra or something like
gmega
force-pushed
the
feat/configurable-nim-repo
branch
from
93d92d5 to
a44352d
Compare
gmega
force-pushed
the
feat/configurable-nim-repo
branch
from
a44352d to
8ef5524
Compare
scripts/build_nim.sh
Outdated
| # upstream already exists, call it "extra" | ||
| NEW_REMOTE="extra" | ||
| fi | ||
| git remote add "${NEW_REMOTE}" "${NIM_COMMIT_REPO_URL}" |
There was a problem hiding this comment.
what happens here if I change the NIM_COMMIT_REPO to a third url? ie I first set it to A then to B?
There was a problem hiding this comment.
Yeah, sorry, this was not ready yet. :-) We do need to delete the extra if it's already set, precisely for the reason you're pointing out. Will wrap this up and ping.
There was a problem hiding this comment.
OK, I added the delete and did a bit of testing - seems to work as expected. The only potential weirdness I see is that if upstream was not set for some reason and the user does something along the lines of what you said; e.g. sets NIM_COMMIT_REPO to A, then to B, then to C, you'll end up with A being set as upstream (once), then B set to extra, then C set to extra, with A sort of perpetually lingering around as upstream which doesn't look very good.
With that in mind, I'm thinking it would probably make more sense, in the event of a custom commit, to:
- set
upstreamalways to https://github.com/nim-lang/Nim/ if unset (as before); - set whatever is supplied in
NIM_COMMIT_REPO, if anything, toextra, replacing what's in there if already set.
Gonna modify it to behave this way - if you think it's a bad idea I can always change it back.
There was a problem hiding this comment.
OK, that's what I have for now (pushed).
Hi guys, not sure if this is a feature that interests anyone else but, since I needed it and implemented it, I've decided to put out a PR here.
It adds a way to specify a different upstream repo for the Nim compiler (i.e. you can set
NIM_REPO=https://github.com/my-org/Nim), in case you want to build it from a fork. Feel free to kill it if not interesting, I'm otherwise happy to fix it if it has issues.