Merge branch 'buildnim'

.appveyor.yml

@@ -1,9 +1,9 @@
 version: '{build}'
 
+image: Visual Studio 2015
+
 cache:
-- x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z -> .appveyor.yml
+  - NimBinaries
-- i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z -> .appveyor.yml
-- Nim -> .appveyor.yml
 
 matrix:
   # We always want 32 and 64-bit compilation
@@ -13,75 +13,29 @@ platform:
   - x86
   - x64
 
+# when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
+clone_depth: 10
+
 install:
-  - setlocal EnableExtensions EnableDelayedExpansion
+  - git submodule update --init --recursive
 
-  - IF "%PLATFORM%" == "x86" (
+  # use the newest versions documented here: https://www.appveyor.com/docs/windows-images-software/#mingw-msys-cygwin
-      SET "MINGW_ARCHIVE=i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" &
+  - IF "%PLATFORM%" == "x86" SET PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%
-      SET "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" &
+  - IF "%PLATFORM%" == "x64" SET PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%
-      SET "MINGW_DIR=mingw32"
-    ) ELSE (
-      IF "%PLATFORM%" == "x64" (
-        SET "MINGW_ARCHIVE=x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" &
-        SET "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" &
-        SET "MINGW_DIR=mingw64"
-      ) else (
-        echo "Unknown platform"
-      )
-    )
-
-  - SET PATH=%CD%\%MINGW_DIR%\bin;%CD%\Nim\bin;%PATH%
-
-  # Unpack mingw
-  - IF NOT EXIST "%MINGW_ARCHIVE%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%"
-  - 7z x -y "%MINGW_ARCHIVE%" > nul
 
   # build nim from our own branch - this to avoid the day-to-day churn and
   # regressions of the fast-paced Nim development while maintaining the
   # flexibility to apply patches
-  - SET "NEED_REBUILD="
+  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus/devel/build_nim.sh
-
+  - env MAKE="mingw32-make -j2" ARCH_OVERRIDE=%PLATFORM% bash build_nim.sh Nim csources dist/nimble NimBinaries
-  - IF NOT EXIST "Nim\\.git\\" (
+  - SET PATH=%CD%\Nim\bin;%PATH%
-      git clone https://github.com/status-im/Nim.git
-    ) ELSE (
-      ( cd Nim ) &
-      ( git pull ) &
-      ( cd .. )
-    )
-
-  # Rebuild Nim if HEAD has moved or if we don't yet have a cached version
-  - IF NOT EXIST "Nim\\ver.txt" (
-      SET NEED_REBUILD=1
-    ) ELSE (
-      ( CD Nim ) &
-      ( git rev-parse HEAD > ..\\cur_ver.txt ) &
-      ( fc ver.txt ..\\cur_ver.txt || SET NEED_REBUILD=1 ) &
-      ( cd .. )
-    )
-
-  - IF NOT EXIST "Nim\\bin\\nim.exe" SET NEED_REBUILD=1
-  - IF NOT EXIST "Nim\\bin\\nimble.exe" SET NEED_REBUILD=1
-
-  # after building nim, wipe csources to save on cache space
-  - IF DEFINED NEED_REBUILD (
-      cd Nim &
-      ( IF EXIST "csources" rmdir /s /q csources ) &
-      git clone --depth 1 https://github.com/nim-lang/csources &
-      cd csources &
-      ( IF "%PLATFORM%" == "x64" ( build64.bat ) else ( build.bat ) ) &
-      cd .. &
-      bin\nim c koch &
-      koch boot -d:release &
-      koch nimble &
-      git rev-parse HEAD > ver.txt &
-      rmdir /s /q csources
-    )
 
 build_script:
   - cd C:\projects\%APPVEYOR_PROJECT_SLUG%
-  - nimble install -dy
+  - nimble install -y
+
 test_script:
-  - git submodule update --init --recursive # On Linux nimble install does submodules though.
   - nimble test
 
 deploy: off
+

.travis.yml

@@ -1,14 +1,13 @@
-language: c # or other C/C++ variants
+language: c
-
-sudo: false
 
 # https://docs.travis-ci.com/user/caching/
-#
-# Caching the whole nim folder is better than relying on ccache - this way, we
-# skip the expensive bootstrap process and linking
 cache:
   directories:
-    - nim
+    - NimBinaries
+
+git:
+  # when multiple CI builds are queued, the tested commit needs to be in the last X commits cloned with "--depth X"
+  depth: 10
 
 os:
   - linux
@@ -18,22 +17,11 @@ install:
   # build nim from our own branch - this to avoid the day-to-day churn and
   # regressions of the fast-paced Nim development while maintaining the
   # flexibility to apply patches
-  #
+  - curl -O -L -s -S https://raw.githubusercontent.com/status-im/nimbus/devel/build_nim.sh
-  # check version of remote branch
+  - env MAKE="make -j2" bash build_nim.sh Nim csources dist/nimble NimBinaries
-  - "export NIMVER=$(git ls-remote https://github.com/status-im/nim.git HEAD | cut -f 1)"
+  - export PATH=$PWD/Nim/bin:$PATH
-
-  # after building nim, wipe csources to save on cache space
-  - "{ [ -f nim/$NIMVER/bin/nim ] && [ -f nim/$NIMVER/bin/nimble ] ; } ||
-      { rm -rf nim ;
-        mkdir -p nim ;
-        git clone --depth=1 https://github.com/status-im/nim.git nim/$NIMVER ;
-        cd nim/$NIMVER ;
-        sh build_all.sh ;
-        rm -rf csources ;
-        cd ../.. ;
-      }"
-  - "export PATH=$PWD/nim/$NIMVER/bin:$PATH"
 
 script:
   - nimble install -y
   - nimble test
+