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.
This commit is contained in:
oldmud0 2020-08-19 23:07:45 -05:00
commit 5e1474fefc
3 changed files with 26 additions and 12 deletions

View File

@ -5,8 +5,6 @@ stages:
cache:
key: ${CI_COMMIT_REF_SLUG}
paths:
- lib/
variables:
DEBIAN_FRONTEND: noninteractive
@ -15,7 +13,7 @@ before_script:
- echo Current working directory is $(pwd)
build linux x86_64:
image: ubuntu
image: ubuntu:18.04
stage: build
tags:
- docker
@ -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,14 @@ 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 |

View File

@ -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/";

View File

@ -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