Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#Fixes #24536 building nimble 0.16.4 fails when running build_all.sh #24537

Merged
merged 2 commits into from
Dec 16, 2024
Merged

#Fixes #24536 building nimble 0.16.4 fails when running build_all.sh #24537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69244a7
#Fixes #24536 building nimble 0.16.4 fails when running build_all.sh
jmgomez Dec 14, 2024
0dc6837
updates genBuildExtras
jmgomez Dec 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_all.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ if not exist %nim_csources% (
)
bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
koch tools --skipUserCfg --skipParentCfg --hints:off
koch tools --skipUserCfg --hints:off
2 changes: 1 addition & 1 deletion build_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ nimBuildCsourcesIfNeeded "$@"

echo_run bin/nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
echo_run ./koch boot -d:release --skipUserCfg --skipParentCfg --hints:off
echo_run ./koch tools --skipUserCfg --skipParentCfg --hints:off
echo_run ./koch tools --skipUserCfg --hints:off

2 changes: 1 addition & 1 deletion tools/ci_generate.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ proc genBuildExtras(echoRun, koch, nim: string): string =
result = fmt"""
{echoRun}{nim} c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch
{echoRun}{koch} boot -d:release --skipUserCfg --skipParentCfg --hints:off
{echoRun}{koch} tools --skipUserCfg --skipParentCfg --hints:off
{echoRun}{koch} tools --skipUserCfg --hints:off
"""

proc genWindowsScript(buildAll: bool): string =
Expand Down
6 changes: 4 additions & 2 deletions tools/deps.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ proc cloneDependency*(destDirBase: string, url: string, commit = commitHead,
proc updateSubmodules*(dir: string) =
let oldDir = getCurrentDir()
setCurrentDir(dir)
exec "git submodule update --init"
setCurrentDir(oldDir)
try:
exec "git submodule update --init"
finally:
setCurrentDir(oldDir)