diff options
| -rw-r--r-- | .gitlab-ci.yml | 38 | ||||
| -rw-r--r-- | ci/nsis_build.bat | 12 |
2 files changed, 9 insertions, 41 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cf30eb89..54b40dcd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,19 +18,6 @@ stages: tags: - windows -build-linux: - stage: build - script: - - sh ci/build.sh - artifacts: - paths: - - bin/nim - - bin/nimd - - compiler/nim - - koch - expire_in: 1 week - tags: - - linux build-windows: stage: build @@ -58,15 +45,7 @@ deploy-windows: - windows - fast -test-linux: - stage: test - <<: *linux_set_path_def - script: - - sh ci/deps.sh - - nim c --taintMode:on tests/testament/tester - - tests/testament/tester --pedantic all - tags: - - linux + test-windows: stage: test @@ -79,18 +58,3 @@ test-windows: - windows - fast -.csources: &csources_definition - stage: test - script: - - apt-get update -qq - - apt-get install -y -qq build-essential git - - nim -v - - ./koch csources - - ./koch xz - artifacts: - paths: - - build/c_code - -csources-linux: - <<: *csources_definition - <<: *linux_set_path_def diff --git a/ci/nsis_build.bat b/ci/nsis_build.bat index cb54a82b8..f870e8e88 100644 --- a/ci/nsis_build.bat +++ b/ci/nsis_build.bat @@ -38,8 +38,11 @@ set PATH=C:\Users\araq\projects\mingw32\bin;%PATH% cd csources call build.bat cd .. -koch boot -d:release || exit /b -koch nsis -d:release || exit /b +ReM Rebuilding koch is necessary because it uses its pointer size to determine +ReM which mingw link to put in the NSIS installer. +nim c --out:koch_temp koch || exit /b +koch_temp boot -d:release || exit /b +koch_temp nsis -d:release || exit /b dir build move /y build\nim_%NIMVER%.exe build\nim-%NIMVER%_x32.exe || exit /b @@ -49,6 +52,7 @@ set PATH=C:\Users\araq\projects\mingw64\bin;%PATH% cd csources call build64.bat cd .. -koch boot -d:release || exit /b -koch nsis -d:release || exit /b +nim c --out:koch_temp koch || exit /b +koch_temp boot -d:release || exit /b +koch_temp nsis -d:release || exit /b move /y build\nim_%NIMVER%.exe build\nim-%NIMVER%_x64.exe || exit /b |