Merge branch 'appveyor'

.appveyor.yml

@@ -1,12 +1,12 @@
 version: '{build}'
 
+image: Visual Studio 2015
+
 cache:
 - sqlite-dll-win32-x86-3240000.zip -> .appveyor.yml
 - sqlite-dll-win64-x64-3240000.zip -> .appveyor.yml
 - nimbus-deps.zip -> .appveyor.yml
-- x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z
+- Nim -> .appveyor.yml
-- i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z
-- Nim
 
 matrix:
   # We always want 32 and 64-bit compilation
@@ -20,33 +20,24 @@ install:
   - setlocal EnableExtensions EnableDelayedExpansion
 
   - IF "%PLATFORM%" == "x86" (
-      SET "MINGW_ARCHIVE=i686-4.9.2-release-win32-dwarf-rt_v4-rev4.7z" &
-      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" &
-      SET "MINGW_DIR=mingw32" &
       SET "SQLITE_URL=https://www.sqlite.org/2018/sqlite-dll-win32-x86-3240000.zip" &
       SET "SQLITE_ARCHIVE=sqlite-dll-win32-x86-3240000.zip" &
       SET "ROCKSDB_URL=https://github.com/status-im/nimbus-deps/releases/download/nimbus-deps/nimbus-deps.zip" &
       SET "ROCKSDB_ARCHIVE=nimbus-deps.zip"
-    ) ELSE (
+    )
-      IF "%PLATFORM%" == "x64" (
+  - IF "%PLATFORM%" == "x64" (
-        SET "MINGW_ARCHIVE=x86_64-4.9.2-release-win32-seh-rt_v4-rev4.7z" &
+      SET "SQLITE_URL=https://www.sqlite.org/2018/sqlite-dll-win64-x64-3240000.zip" &
-        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 "SQLITE_ARCHIVE=sqlite-dll-win64-x64-3240000.zip" &
-        SET "MINGW_DIR=mingw64" &
+      SET "ROCKSDB_URL=https://github.com/status-im/nimbus-deps/releases/download/nimbus-deps/nimbus-deps.zip" &
-        SET "SQLITE_URL=https://www.sqlite.org/2018/sqlite-dll-win64-x64-3240000.zip" &
+      SET "ROCKSDB_ARCHIVE=nimbus-deps.zip"
-        SET "SQLITE_ARCHIVE=sqlite-dll-win64-x64-3240000.zip" &
-        SET "ROCKSDB_URL=https://github.com/status-im/nimbus-deps/releases/download/nimbus-deps/nimbus-deps.zip" &
-        SET "ROCKSDB_ARCHIVE=nimbus-deps.zip"
-      ) else (
-        echo "Unknown platform"
-      )
     )
 
-  - MKDIR %CD%\bin
+  # use the newest versions documented here: https://www.appveyor.com/docs/windows-images-software/#mingw-msys-cygwin
-  - SET PATH=%CD%\%MINGW_DIR%\bin;%CD%\bin;%CD%\Nim\bin;%PATH%
+  - IF "%PLATFORM%" == "x86" SET PATH=C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin;%PATH%
+  - IF "%PLATFORM%" == "x64" SET PATH=C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\bin;%PATH%
 
-  # Unpack mingw
+  - MKDIR %CD%\bin
-  - IF NOT EXIST "%MINGW_ARCHIVE%" appveyor DownloadFile "%MINGW_URL%" -FileName "%MINGW_ARCHIVE%"
+  - SET PATH=%CD%\bin;%CD%\Nim\bin;%PATH%
-  - 7z x -y "%MINGW_ARCHIVE%" > nul
 
   # Unpack sqlite
   - IF not exist "%SQLITE_ARCHIVE%" appveyor DownloadFile "%SQLITE_URL%" -FileName "%SQLITE_ARCHIVE%"
@@ -113,7 +104,8 @@ install:
 
 build_script:
   - cd C:\projects\%APPVEYOR_PROJECT_SLUG%
-  - nimble install -y
+  - bash -c "nimble install -y"
+
 test_script:
   - nimble test