aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authoroldmud0 <oldmud0@users.noreply.github.com>2019-04-17 11:07:09 -0500
committeroldmud0 <oldmud0@users.noreply.github.com>2020-08-13 10:39:08 -0500
commit593e9d7353f601f81bbe26925ace4966434e7370 (patch)
tree88859478fe6c88e4c455e1a3457f2f7fa8779bac /scripts
parent5a023e3e07c6d9f0649b5c6b915be9984508415c (diff)
Miscellaneous changes to CI scripts
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/update_manifest.js4
-rw-r--r--scripts/windows/Dockerfile5
2 files changed, 6 insertions, 3 deletions
diff --git a/scripts/update_manifest.js b/scripts/update_manifest.js
index 1a06a2d7..bbd2a5f4 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 b9a12d66..9d3cca06 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