diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-08-19 23:07:45 -0500 |
|---|---|---|
| committer | oldmud0 <oldmud0@users.noreply.github.com> | 2020-08-19 23:07:45 -0500 |
| commit | 5e1474fefc6837d3eb1a2449950d4be1371f5be1 (patch) | |
| tree | 7c645b67d95e53e2f5cf15875dfd40e839f41d0c /scripts | |
| parent | 7cd0fa0c6e9875c0f199c6d7448e0a031dd8e631 (diff) | |
| parent | a9ca555ec532f46a5e5b29404434ae7295814163 (diff) | |
Merge some various CI changes
Most importantly, Linux now targets Qt 5.9.5 with a self-built version
of QtApng, which should fix the Qt version issues.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/update_manifest.js | 4 | ||||
| -rw-r--r-- | scripts/windows/Dockerfile | 5 |
2 files changed, 6 insertions, 3 deletions
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 |