make drone ci use debian testing (#1413)

.drone.jsonnet

@@ -1,8 +1,7 @@
 local default_deps_base='libsystemd-dev python3-dev libcurl4-openssl-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-dev libsqlite3-dev';
 local default_deps_nocxx='libsodium-dev ' + default_deps_base; // libsodium-dev needs to be >= 1.0.18
 local default_deps='g++ ' + default_deps_nocxx; // g++ sometimes needs replacement
-local default_windows_deps='mingw-w64-binutils mingw-w64-gcc mingw-w64-crt mingw-w64-headers mingw-w64-winpthreads perl openssh zip bash'; // deps for windows cross compile
-
+local default_windows_deps='mingw-w64 zip nsis';
 
 
 local submodules = {
@@ -64,7 +63,6 @@ local debian_pipeline(name, image,
 // windows cross compile on alpine linux
 local windows_cross_pipeline(name, image,
         arch='amd64',
-        deps=default_windows_deps,
         build_type='Release',
         lto=false,
         werror=false,
@@ -85,17 +83,21 @@ local windows_cross_pipeline(name, image,
             [if allow_fail then "failure"]: "ignore",
             environment: { SSH_KEY: { from_secret: "SSH_KEY" }, WINDOWS_BUILD_NAME: toolchain+"bit" },
             commands: [
-                'apk update && apk upgrade',
-                'apk add cmake git ninja pkgconf ccache patch make ' + deps,
+                'echo "man-db man-db/auto-update boolean false" | debconf-set-selections',
+                'apt-get update',
+                'apt-get install -y eatmydata',
+                'eatmydata apt install -y build-essential cmake git ninja-build pkg-config ccache mingw-w64 nsis zip',
+                'update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix',
+                'update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix',
                 'git clone https://github.com/despair86/libuv.git win32-setup/libuv',
                 'mkdir build',
                 'cd build',
                 'cmake .. -G Ninja -DCMAKE_CROSSCOMPILE=ON -DCMAKE_EXE_LINKER_FLAGS=-fstack-protector -DLIBUV_ROOT=$PWD/../win32-setup/libuv -DCMAKE_CXX_FLAGS=-fdiagnostics-color=always -DCMAKE_TOOLCHAIN_FILE=../contrib/cross/mingw'+toolchain+'.cmake -DCMAKE_BUILD_TYPE='+build_type+' ' +
                     (if werror then '-DWARNINGS_AS_ERRORS=ON ' else '') +
                     (if lto then '' else '-DWITH_LTO=OFF ') +
-                    "-DBUILD_STATIC_DEPS=ON -DDOWNLOAD_SODIUM=ON -DBUILD_PACKAGE=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=ON -DNATIVE_BUILD=OFF -DSTATIC_LINK=ON" +
+                    "-DBUILD_STATIC_DEPS=ON -DDOWNLOAD_SODIUM=ON -DBUILD_PACKAGE=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DNATIVE_BUILD=OFF -DSTATIC_LINK=ON" +
                 cmake_extra,
-                'ninja -v',
+                'ninja -v package',
             ] + extra_cmds,
         }
     ],
@@ -204,14 +206,10 @@ local mac_builder(name, build_type='Release', werror=true, cmake_extra='', extra
     debian_pipeline("Debian buster (armhf)", "arm32v7/debian:buster", arch="arm64", cmake_extra='-DDOWNLOAD_SODIUM=ON'),
     
     // Windows builds (WOW64 and native)
-    windows_cross_pipeline("win32 on alpine (amd64)", "alpine:edge",
+    windows_cross_pipeline("win32 (amd64)", "debian:testing",
         toolchain='64', extra_cmds=[
           '../contrib/ci/drone-static-upload.sh'
     ]),
-     windows_cross_pipeline("win32 on alpine (i386)", "i386/alpine:edge",
-        toolchain='32', extra_cmds=[
-          '../contrib/ci/drone-static-upload.sh'
-    ]),
 
     // Static build (on bionic) which gets uploaded to builds.lokinet.dev:
     debian_pipeline("Static (bionic amd64)", "ubuntu:bionic", deps='g++-8 python3-dev', lto=true,

contrib/ci/drone-static-upload.sh

@@ -35,7 +35,7 @@ fi
 
 mkdir -v "$base"
 if [ -e daemon/lokinet.exe ]; then
-    cp -av daemon/lokinet.exe daemon/lokinet-vpn.exe ../lokinet-bootstrap.ps1 "$base"
+    cp -av lokinet-*.exe ../lokinet-bootstrap.ps1 "$base"
     # zipit up yo
     archive="$base.zip"
     zip -r "$archive" "$base"