From d10ad44ff9656e6128b63cf932289b1bf875bc3e Mon Sep 17 00:00:00 2001
From: oldmud0 <oldmud0@users.noreply.github.com>
Date: Tue, 18 Aug 2020 14:24:15 -0500
Subject: [PATCH] CI: Build QtApng on Linux

- Set lib as artifact instead of cache (to avoid race condition
  described in https://gitlab.com/gitlab-org/gitlab/-/issues/21409)
- Delete _Unadapted folder and .git files when exporting artifact (yuck!
  should probably have never incorporated AO2-Themes as a separate
  repo; it should probably have stayed part of the vanilla repo.)
---
 .gitlab-ci.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index faa01d4..6cb63b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,6 @@ stages:
 
 cache:
   key: ${CI_COMMIT_REF_SLUG}
-  paths:
-    - lib/
 
 variables:
   DEBIAN_FRONTEND: noninteractive
@@ -53,11 +51,21 @@ build linux x86_64:
     - cd ..
 
     # Extract QtApng
-    - mkdir qtapng
-    - cd qtapng
-    - curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.0-5/build_gcc_64_5.12.0.tar.xz -o apng.tar.xz
-    - tar -xvf apng.tar.xz
-    - cp gcc_64/plugins/imageformats/libqapng.so ../lib
+    #- mkdir qtapng
+    #- cd qtapng
+    #- curl -L https://github.com/Skycoder42/QtApng/releases/download/1.1.0-5/build_gcc_64_5.12.0.tar.xz -o apng.tar.xz
+    #- tar -xvf apng.tar.xz
+    #- cp gcc_64/plugins/imageformats/libqapng.so ../lib
+    #- cd ..
+
+    # Build QtApng
+    - git clone https://github.com/Skycoder42/QtApng
+    - cd QtApng
+    - qmake -spec linux-clang
+    # Don't make examples - they're not compatible with Qt 5.9
+    - make -j4 sub-src
+    #- make sub-src-install_subtargets
+    - cp plugins/imageformats/libqapng.so ../lib
     - cd ..
 
     # Build
@@ -68,6 +76,7 @@ build linux x86_64:
     - upx --lzma -9 --force bin/Attorney_Online
   artifacts:
     paths:
+      - lib/
       - bin/
 
 build windows i686:
@@ -116,12 +125,15 @@ build windows i686:
     - upx --lzma -9 --force bin/Attorney_Online.exe
   artifacts:
     paths:
+      - lib/
       - bin/
 
 # Base folder
 .deploy_base: &deploy_base |
     mkdir base
     cp -a ../base/ base/
+    rm -rf base/themes/_Unadapted/
+    rm base/themes/.gitattributes base/themes/.git
 
 # Miscellaneous files
 .deploy_misc: &deploy_misc |