From 9620d206b9c8e7a1a54bc8f4a2d732c384cc35c0 Mon Sep 17 00:00:00 2001 From: narimiran Date: Mon, 16 Dec 2024 14:01:53 +0100 Subject: [PATCH] Revert "(cherry picked from commit 556f217b4cbebad0d8eabb1733fb1dcca46585ec)" This reverts commit 9e5cdc43a61c3f6e04008939d13d48aecec83d23. --- build_all.bat | 6 +++--- build_all.sh | 2 +- tools/ci_generate.nim | 6 +++--- tools/deps.nim | 6 ++---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build_all.bat b/build_all.bat index e4d8ec31e5..ef4a5f6a4e 100644 --- a/build_all.bat +++ b/build_all.bat @@ -24,6 +24,6 @@ if not exist %nim_csources% ( cd .. copy /y bin\nim.exe %nim_csources% ) -bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch -koch boot -d:release --skipUserCfg --skipParentCfg --hints:off -koch tools --skipUserCfg --hints:off + bin\nim.exe c --noNimblePath --skipUserCfg --skipParentCfg --hints:off koch + koch boot -d:release --skipUserCfg --skipParentCfg --hints:off + koch tools --skipUserCfg --skipParentCfg --hints:off diff --git a/build_all.sh b/build_all.sh index ddb8891a1f..83848f41a1 100755 --- a/build_all.sh +++ b/build_all.sh @@ -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 --hints:off +echo_run ./koch tools --skipUserCfg --skipParentCfg --hints:off diff --git a/tools/ci_generate.nim b/tools/ci_generate.nim index 2e176691d2..46bc39470f 100644 --- a/tools/ci_generate.nim +++ b/tools/ci_generate.nim @@ -42,9 +42,9 @@ triggers: 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 --hints:off +{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 """ proc genWindowsScript(buildAll: bool): string = diff --git a/tools/deps.nim b/tools/deps.nim index cc50cedb53..6568de7ff2 100644 --- a/tools/deps.nim +++ b/tools/deps.nim @@ -46,7 +46,5 @@ proc cloneDependency*(destDirBase: string, url: string, commit = commitHead, proc updateSubmodules*(dir: string) = let oldDir = getCurrentDir() setCurrentDir(dir) - try: - exec "git submodule update --init" - finally: - setCurrentDir(oldDir) \ No newline at end of file + exec "git submodule update --init" + setCurrentDir(oldDir)