status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add an upstream remote to the Status Nim fork repo 

and fix the Nimble commit that went missing upstream at some point
This commit is contained in:
Ștefan Talpalaru 2021-04-29 01:07:25 +02:00
parent 7d418e44da
commit 135e43468f
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build_nim.sh
View File

@ -12,7 +12,7 @@ set -e
# Git commits # Git commits
: ${CSOURCES_COMMIT:=f72f471adb743bea4f8d8c59d19aa1cb885dcc59} # 0.20.0 : ${CSOURCES_COMMIT:=f72f471adb743bea4f8d8c59d19aa1cb885dcc59} # 0.20.0
: ${NIMBLE_COMMIT:=007b2a778429a978e12307bf13a038029b4c4d9} # 0.11.0 : ${NIMBLE_COMMIT:=d13f3b8ce288b4dc8c34c219a4e050aaeaf43fc9} # 0.13.1
: ${NIM_COMMIT:=nimbus} # could be a (partial) commit hash, a tag, a branch name, etc. : ${NIM_COMMIT:=nimbus} # could be a (partial) commit hash, a tag, a branch name, etc.
NIM_COMMIT_HASH="" # full hash for NIM_COMMIT, retrieved in "nim_needs_rebuilding()" NIM_COMMIT_HASH="" # full hash for NIM_COMMIT, retrieved in "nim_needs_rebuilding()"
@ -61,6 +61,8 @@ nim_needs_rebuilding() {
pushd "${NIM_DIR}" >/dev/null pushd "${NIM_DIR}" >/dev/null
if ! git checkout -q ${NIM_COMMIT}; then if ! git checkout -q ${NIM_COMMIT}; then
# Pay the price for a non-default NIM_COMMIT here, by fetching everything. # 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 fetch --all git fetch --all
git checkout -q ${NIM_COMMIT} git checkout -q ${NIM_COMMIT}
fi fi