From d89a4370a753f6e1da22349866b1b00f638884a6 Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Thu, 21 May 2020 14:22:51 -0500
Subject: [PATCH] Update CI pipeline for release

---
 .gitlab-ci.yml             | 36 ++++++++++++++++++++++++++++++++----
 scripts/wasabi_program.sh  |  2 +-
 scripts/windows/Dockerfile | 11 +++++++++--
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc15619..e9685de 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,6 +83,9 @@ build windows i686:
     - git submodule init
     - git submodule update
 
+    # Print versions
+    - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake --version
+
     # Extract BASS
     - mkdir bass
     - cd bass
@@ -94,6 +97,17 @@ build windows i686:
     - cp bassopus.dll ../lib
     - cd ..
 
+    # Extract QtApng
+    # - mkdir qtapng
+    # - cd qtapng
+    # - curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.2-2/qtapng_mingw73_32_5.13.0.zip -o apng.zip
+    # - unzip apng.zip
+    # - mkdir ../lib/imageformats
+    # - cp mingw73_32/plugins/imageformats/qapng.dll ../lib/imageformats/
+    # - cd ..
+
+    - ls lib
+
     # Build
     - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += DISCORD BASSAUDIO"
     - make -j4
@@ -165,6 +179,8 @@ deploy windows i686:
 
     # Platform-specific
     - cp -a ../lib/*.dll .
+    - mkdir imageformats
+    - 'cp -a ../lib/imageformats/*.dll imageformats/ || :'
     - cp -a ../bin/Attorney_Online.exe .
 
     # Zipping
@@ -197,11 +213,17 @@ publish linux x86_64:
     - deploy linux x86_64
   when: manual
   script:
+    - apt-get update
+    - apt-get install --no-install-recommends -y git nodejs npm awscli
+    - cd scripts
+    - npm install
+    - cd ..
+
     - cd zip
-    - ../scripts/wasabi.sh
+    - ../scripts/wasabi_program.sh
   variables:
     MANIFEST: program_linux_x86_64.json
-    ARTIFACT_SUFFIX: _linux_x64.tar.xz
+    ARTIFACT_SUFFIX: linux_x64.tar.xz
 
 publish windows i686:
   image: ubuntu
@@ -210,8 +232,14 @@ publish windows i686:
     - deploy windows i686
   when: manual
   script:
+    - apt-get update
+    - apt-get install --no-install-recommends -y git nodejs npm awscli
+    - cd scripts
+    - npm install
+    - cd ..
+
     - cd zip
-    - ../scripts/wasabi.sh
+    - ../scripts/wasabi_program.sh
   variables:
     MANIFEST: program_winnt_i386.json
-    ARTIFACT_SUFFIX: _windows_x86.zip
+    ARTIFACT_SUFFIX: windows_x86.zip
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.
 #
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