diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-08-21 12:42:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:42:45 -0500 |
| commit | 2c6a690d47ca0c48bef84b3d28d58064365a9934 (patch) | |
| tree | cdc2a42b51e4bbe3c008adab296ac306d6dbdfd7 /.gitlab-ci.yml | |
| parent | ec1c95bdb33dd063880c4cb6c3c9c3cf5d0ed454 (diff) | |
| parent | af1e76022568af1f146e2b49e96af85eb06521b9 (diff) | |
Merge pull request #246 from AttorneyOnline/2.8
Merges 2.8.5, which is a patch release for 2.8 with no substantially new features.
This commit is release-ready.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0b0886f..0230d401 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 @@ -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 @@ -34,15 +32,15 @@ build linux x86_64: - clang --version # Extract BASS - #- mkdir bass - #- cd bass - #- curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip - #- unzip bass.zip - #- cp x64/libbass.so ../lib - #- curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip - #- unzip bassopus.zip - #- cp x64/libbassopus.so ../lib - #- cd .. + - mkdir bass + - cd bass + - curl http://www.un4seen.com/files/bass24-linux.zip -o bass.zip + - unzip bass.zip + - cp x64/libbass.so ../lib + - curl http://www.un4seen.com/files/bassopus24-linux.zip -o bassopus.zip + - unzip bassopus.zip + - cp x64/libbassopus.so ../lib + - cd .. # Extract Discord RPC - mkdir discord-rpc @@ -53,21 +51,32 @@ 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 - - qmake -spec linux-clang "DEFINES += DISCORD QTAUDIO" + - qmake -spec linux-clang "DEFINES += DISCORD" - make -j4 # Post-processing - upx --lzma -9 --force bin/Attorney_Online artifacts: paths: + - lib/ - bin/ build windows i686: @@ -109,19 +118,21 @@ build windows i686: - ls lib # Build - - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += DISCORD BASSAUDIO" + - /opt/mxe/usr/${TARGET_SPEC}/qt5/bin/qmake "DEFINES += DISCORD" - make -j4 # Post-processing - 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 | |