CI: NSIS fixes and temporary removal of Linux builds.

Squashed commit of the following:

commit af422c72ccd31054ecb097313275e538c2c8f1ad
Author: Dominik Picheta <dominikpicheta@gmail.com>
Date:   Thu Sep 29 00:42:39 2016 +0200

    CI: Another attempt.

commit f187712192bf80394d0efd7e8ebfcdc07a13ca5a
Author: Dominik Picheta <dominikpicheta@gmail.com>
Date:   Thu Sep 29 00:32:53 2016 +0200

    CI: Remove building of docs before NSIS build.

commit 92abf82d9400ff7f03d7fbfdaaeeb2ee93e803a5
Author: Dominik Picheta <dominikpicheta@gmail.com>
Date:   Thu Sep 29 00:18:24 2016 +0200

    CI: Attempt to fix incorrect mingw arch.

commit 2ec54f89f9725208559f2080dd0f1533b9ae27e0
Author: Dominik Picheta <dominikpicheta@gmail.com>
Date:   Wed Sep 28 23:40:51 2016 +0200

    CI: Rebuild koch so that correct mingw links are put in NSIS.

commit 3118f0fea6fb8d7178e9267d3bf198b4784cb247
Author: Dominik Picheta <dominikpicheta@gmail.com>
Date:   Wed Sep 28 22:36:40 2016 +0200

    CI: Fixes ci

commit fc4d14aa325dc1a95cf63092b209b919df450dcd
Author: Dominik Picheta <dominikpicheta@gmail.com>
Date:   Wed Sep 28 22:35:00 2016 +0200

    CI: Disable linux for now.
This commit is contained in:
Dominik Picheta
2016-09-29 01:19:11 +02:00
parent ae0e5604f4
commit b790159bb9
2 changed files with 9 additions and 41 deletions

View File

@@ -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

View File

@@ -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