diff options
| -rw-r--r-- | appveyor.yml | 29 | ||||
| -rw-r--r-- | koch.nim | 55 | ||||
| -rw-r--r-- | testament/important_packages.nim | 4 |
3 files changed, 43 insertions, 45 deletions
diff --git a/appveyor.yml b/appveyor.yml index 8c4b2a07e..9633bd15a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,23 +5,22 @@ cache: - sqlite-dll-win64-x64-3160200.zip # - i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -matrix: - fast_finish: true - environment: + MINGW_DIR: mingw64 + MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.2/threads-win32/seh/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z/download + MINGW_ARCHIVE: x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z + SQLITE_URL: http://www.sqlite.org/2017/sqlite-dll-win64-x64-3160200.zip + SQLITE_ARCHIVE: sqlite-dll-win64-x64-3160200.zip + platform: x64 + matrix: - - MINGW_DIR: mingw64 - MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.2/threads-win32/seh/x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z/download - MINGW_ARCHIVE: x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z - SQLITE_URL: http://www.sqlite.org/2017/sqlite-dll-win64-x64-3160200.zip - SQLITE_ARCHIVE: sqlite-dll-win64-x64-3160200.zip - platform: x64 - # - MINGW_DIR: mingw32 - # MINGW_URL: https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/dwarf/i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z/download - # MINGW_ARCHIVE: i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z - # SQLITE_URL: http://www.sqlite.org/2017/sqlite-dll-win32-x86-3160200.zip - # SQLITE_ARCHIVE: sqlite-dll-win32-x86-3160200.zip - # platform: x86 + - NIM_TEST_PACKAGES: true + - NIM_TEST_PACKAGES: false + +matrix: + #allow_failures: + # - NIM_TEST_PACKAGES: true + fast_finish: true install: - ps: Install-Product node 8 # node 8 or later is required to test js async stuff diff --git a/koch.nim b/koch.nim index c91f3d6a6..92fc3a766 100644 --- a/koch.nim +++ b/koch.nim @@ -467,34 +467,33 @@ proc runCI(cmd: string) = ## build nimble early on to enable remainder to depend on it if needed kochExecFold("Build Nimble", "nimble") - when false: - for pkg in "zip opengl sdl1 jester@#head niminst".split: - exec "nimble install -y" & pkg - - buildTools() # altenatively, kochExec "tools --toolsNoNimble" - - ## run tests - execFold("Test nimscript", "nim e tests/test_nimscript.nims") - when defined(windows): - # note: will be over-written below - execFold("Compile tester", "nim c -d:nimCoroutines --os:genode -d:posix --compileOnly testament/tester") - - # main bottleneck here - execFold("Run tester", "nim c -r -d:nimCoroutines testament/tester --pedantic all -d:nimCoroutines") - - execFold("Run nimdoc tests", "nim c -r nimdoc/tester") - execFold("Run nimpretty tests", "nim c -r nimpretty/tester.nim") - when defined(posix): - execFold("Run nimsuggest tests", "nim c -r nimsuggest/tester") - - ## remaining actions - when defined(posix): - kochExecFold("Docs", "docs --git.commit:devel") - kochExecFold("C sources", "csource") - elif defined(windows): - when false: - kochExec "csource" - kochExec "zip" + if getEnv("NIM_TEST_PACKAGES", "false") == "true": + execFold("Test selected Nimble packages", "nim c -r testament/tester cat nimble-extra") + else: + buildTools() # altenatively, kochExec "tools --toolsNoNimble" + + ## run tests + execFold("Test nimscript", "nim e tests/test_nimscript.nims") + when defined(windows): + # note: will be over-written below + execFold("Compile tester", "nim c -d:nimCoroutines --os:genode -d:posix --compileOnly testament/tester") + + # main bottleneck here + execFold("Run tester", "nim c -r -d:nimCoroutines testament/tester --pedantic all -d:nimCoroutines") + + execFold("Run nimdoc tests", "nim c -r nimdoc/tester") + execFold("Run nimpretty tests", "nim c -r nimpretty/tester.nim") + when defined(posix): + execFold("Run nimsuggest tests", "nim c -r nimsuggest/tester") + + ## remaining actions + when defined(posix): + kochExecFold("Docs", "docs --git.commit:devel") + kochExecFold("C sources", "csource") + elif defined(windows): + when false: + kochExec "csource" + kochExec "zip" proc pushCsources() = if not dirExists("../csources/.git"): diff --git a/testament/important_packages.nim b/testament/important_packages.nim index 6607783ab..fbb3edaa8 100644 --- a/testament/important_packages.nim +++ b/testament/important_packages.nim @@ -8,11 +8,11 @@ var packages*: seq[tuple[name, cmd, version: string]] = @[] pkg "karax" pkg "cligen" pkg "glob" -pkg "regex" +#pkg "regex" pkg "freeimage", "nim c freeimage.nim" pkg "zero_functional" pkg "nimpy", "nim c nimpy.nim" -pkg "nimongo", "nimble test_ci" +#pkg "nimongo", "nimble test_ci" pkg "inim" pkg "sdl1", "nim c src/sdl.nim" |