From 8989c4fbc944a9658bd7817d33ec52a3976172f9 Mon Sep 17 00:00:00 2001
From: oldmud0 <3421260-oldmud0@users.noreply.gitlab.com>
Date: Tue, 19 May 2020 23:50:48 +0000
Subject: CI: Update Dockerfile

---
 scripts/windows/Dockerfile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/windows/Dockerfile b/scripts/windows/Dockerfile
index f4f1a83..b9a12d6 100644
--- a/scripts/windows/Dockerfile
+++ b/scripts/windows/Dockerfile
@@ -10,5 +10,12 @@ RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake .. -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr
 RUN /opt/mxe/usr/bin/${TARGET_SPEC}-cmake --build . --config Release --target install
 WORKDIR ../..
 
-# NOTE: Do not build QtApng statically! libpng contains a self-test entry point that
-# takes precedence for some reason over the final build's entry point.
+# Build QtApng statically
+RUN git clone https://github.com/Skycoder42/QtApng
+WORKDIR QtApng
+# libpng contains a self-test entry point that takes precedence for some reason
+# over the final build's entry point.
+RUN sed -i "s/^main(/libpng_main(/g" src/3rdparty/libpng/src/pngtest.c
+RUN /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake
+RUN make && make install
+WORKDIR ..
\ No newline at end of file
-- 
cgit 


From 2cf5a046cae02d6e0da283190f7c303f607e1c75 Mon Sep 17 00:00:00 2001
From: oldmud0 <3421260-oldmud0@users.noreply.gitlab.com>
Date: Wed, 20 May 2020 19:08:38 +0000
Subject: wasabi_program.sh: use bash instead of sh

---
 scripts/wasabi_program.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/wasabi_program.sh b/scripts/wasabi_program.sh
index 41e2e35..37feac6 100755
--- a/scripts/wasabi_program.sh
+++ b/scripts/wasabi_program.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Updates the specified program manifest to a new archive and version
 # and uploads the new archive and manifest to S3/Wasabi.
 #
-- 
cgit 


From 593e9d7353f601f81bbe26925ace4966434e7370 Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Wed, 17 Apr 2019 11:07:09 -0500
Subject: Miscellaneous changes to CI scripts

---
 scripts/update_manifest.js | 4 +---
 scripts/windows/Dockerfile | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/update_manifest.js b/scripts/update_manifest.js
index 1a06a2d..bbd2a5f 100755
--- a/scripts/update_manifest.js
+++ b/scripts/update_manifest.js
@@ -101,9 +101,7 @@ const specialActions = changesFile ?
     // higher-level directories will succeed.
     .concat(Array.from(dirsDeleted.values())
         .sort((a, b) => b.split("/").length - a.split("/").length)
-        .map(dir => {
-            return { action: "deleteDir", target: dir };
-        }))
+        .map(dir => ({ action: "deleteDir", target: dir })))
     : [];
 
 const urlBase = "https://s3.wasabisys.com/ao-downloads/";
diff --git a/scripts/windows/Dockerfile b/scripts/windows/Dockerfile
index b9a12d6..9d3cca0 100644
--- a/scripts/windows/Dockerfile
+++ b/scripts/windows/Dockerfile
@@ -3,6 +3,11 @@ FROM oldmud0/mxe-qt:5.13.0-win32-static-posix
 
 ENV TARGET_SPEC i686-w64-mingw32.static.posix
 
+# Build libarchive statically
+WORKDIR /opt/mxe
+RUN make -j4 MXE_TARGETS=${TARGET_SPEC} libarchive bzip2 xz lz4 zstd nettle expat libxml2
+WORKDIR /
+
 # Build Discord RPC statically
 RUN git clone https://github.com/discordapp/discord-rpc
 WORKDIR discord-rpc/build
-- 
cgit