update ci to use zip for windows

.drone.jsonnet

@@ -1,8 +1,8 @@
 local default_deps_base='libsystemd-dev python3-dev libcurl4-openssl-dev libuv1-dev libunbound-dev nettle-dev libssl-dev libevent-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-binutils mingw-w64-gcc mingw-w64-crt mingw-w64-headers mingw-w64-winpthreads perl openssh bash xz'; // deps for windows cross compile
 
 
 local submodules = {
@@ -200,11 +200,11 @@ local mac_builder(name, build_type='Release', werror=true, cmake_extra='', extra
     // Windows builds (WOW64 and native)
     windows_cross_pipeline("win32 on alpine (amd64)", "alpine:edge",
         toolchain='mingw64', extra_cmds=[
-          '../contrib/ci/drone-static-upload.sh'
+          '../contrib/ci/drone-windows-upload.sh'
     ]),
      windows_cross_pipeline("win32 on alpine (i386)", "i386/alpine:edge",
         toolchain='mingw32', extra_cmds=[
-          '../contrib/ci/drone-static-upload.sh'
+          '../contrib/ci/drone-windows-upload.sh'
     ]),
 
     // Static build (on bionic) which gets uploaded to builds.lokinet.dev:

contrib/ci/drone-windows-upload.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+# Script used with Drone CI to upload build artifacts (because specifying all this in
+# .drone.jsonnet is too painful).
+
+
+
+set -o errexit
+
+if [ -z "$SSH_KEY" ]; then
+    echo -e "\n\n\n\e[31;1mUnable to upload artifact: SSH_KEY not set\e[0m"
+    # Just warn but don't fail, so that this doesn't trigger a build failure for untrusted builds
+    exit 0
+fi
+
+echo "$SSH_KEY" >ssh_key
+
+set -o xtrace  # Don't start tracing until *after* we write the ssh key
+
+chmod 600 ssh_key
+
+if [ -n "$DRONE_TAG" ]; then
+    # For a tag build use something like `lokinet-linux-amd64-v1.2.3`
+    base="lokinet-windows-$DRONE_TAG"
+else
+    # Otherwise build a length name from the datetime and commit hash, such as:
+    # lokinet-linux-amd64-20200522T212342Z-04d7dcc54
+    base="lokinet-windows-$(date --date=@$DRONE_BUILD_CREATED +%Y%m%dT%H%M%SZ)-${DRONE_COMMIT:0:9}"
+fi
+
+mkdir -v "$base"
+# copy lokinet-bootstrap.ps1 and lokinet.exe if we are a windows build
+cp -av daemon/lokinet.exe ../lokinet-bootstrap.ps1 "$base"
+# zipit up yo
+zip -r "${base}.zip" "$base"
+
+upload_to="builds.lokinet.dev/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}"
+
+# sftp doesn't have any equivalent to mkdir -p, so we have to split the above up into a chain of
+# -mkdir a/, -mkdir a/b/, -mkdir a/b/c/, ... commands.  The leading `-` allows the command to fail
+# without error.
+upload_dirs=(${upload_to//\// })
+mkdirs=
+dir_tmp=""
+for p in "${upload_dirs[@]}"; do
+    dir_tmp="$dir_tmp$p/"
+    mkdirs="$mkdirs
+-mkdir $dir_tmp"
+done
+
+sftp -i ssh_key -b - -o StrictHostKeyChecking=off drone@builds.lokinet.dev <<SFTP
+$mkdirs
+put $base.zip $upload_to
+SFTP
+
+set +o xtrace
+
+echo -e "\n\n\n\n\e[32;1mUploaded to https://${upload_to}/${base}.zip\e[0m\n\n\n"
+