summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorDominik Picheta <dominikpicheta@gmail.com>2016-09-18 14:01:16 +0200
committerDominik Picheta <dominikpicheta@gmail.com>2016-09-18 14:01:16 +0200
commitc86d1a479c8bea2c510b77a254d5819e970a8f93 (patch)
tree1d753b1cb0c18b58a2814e0750401d2a137a585d
parent985d3313da97abd0511708a09bec92bd3b3a3ccb (diff)
downloadNim-c86d1a479c8bea2c510b77a254d5819e970a8f93.tar.gz
CI: For Windows deploy run `koch winrelease`.
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--ci/nsis_build.bat2
-rw-r--r--koch.nim14
3 files changed, 3 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7de8f79b0..0cf30eb89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -49,7 +49,7 @@ build-windows:
 deploy-windows:
   stage: deploy
   script:
-    - call ci\nsis_build.bat
+    - koch.exe winrelease
   artifacts:
     paths:
       - build/*.exe
diff --git a/ci/nsis_build.bat b/ci/nsis_build.bat
index 74bb663a0..338a975d7 100644
--- a/ci/nsis_build.bat
+++ b/ci/nsis_build.bat
@@ -12,7 +12,7 @@ REM - Tag the release
 REM - Merge devel into master
 REM - Update csources
 
-set NIMVER=0.14.3
+set NIMVER=%1
 
 Rem Build -docs file:
 koch web0
diff --git a/koch.nim b/koch.nim
index 0565d01ef..61272a890 100644
--- a/koch.nim
+++ b/koch.nim
@@ -383,19 +383,7 @@ proc run7z(platform: string, patterns: varargs[string]) =
 ]#
 
 proc winRelease() =
-  boot(" -d:release")
-  #buildTool("tools/niminst/niminst", " -d:release")
-  buildTool("tools/nimgrep", " -d:release")
-  buildTool("compiler/nimfix/nimfix", " -d:release")
-  buildTool("compiler/nimsuggest/nimsuggest", " -d:release")
-
-  #run7z("win32", "bin/nim.exe", "bin/c2nim.exe", "bin/nimgrep.exe",
-  #      "bin/nimfix.exe",
-  #      "bin/nimble.exe", "bin/*.dll",
-  #      "config", "dist/*.dll", "examples", "lib",
-  #      "readme.txt", "contributors.txt", "copying.txt")
-
-  # second step: XXX build 64 bit version
+  exec("call ci\nsis_build.bat " & VersionAsString)
 
 # -------------- tests --------------------------------------------------------