From 5df07f167bf15bcf9d2d43628392675d48d35789 Mon Sep 17 00:00:00 2001 From: woblight Date: Thu, 10 Mar 2022 17:32:25 +0100 Subject: [PATCH] Update CI --- .gitlab-ci.yml | 4 ++-- CI.mk | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d40264a..2c51073 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ before_script: Linux_x64: stage: build script: - - zypper -q install -y libgit2-devel make gcc gcc-c++ libQt5Concurrent-devel libQt5Core-devel libQt5Gui-devel libQt5QuickControls2-devel libqt5-qtbase-devel libqt5-qtdeclarative-devel quazip-qt5-devel + - zypper -q install -y find libgit2-devel make gcc gcc-c++ libQt5Concurrent-devel libQt5Core-devel libQt5Gui-devel libQt5QuickControls2-devel libqt5-qtbase-devel libqt5-qtdeclarative-devel quazip-qt5-devel - make -f CI.mk linuxdeploy - make -f CI.mk finalize artifacts: @@ -24,7 +24,7 @@ Win32: stage: build script: - zypper -q remove -y patterns-base-fips - - zypper -q install -y wine-staging wine-staging-32bit wget make p7zip tar gzip || true + - zypper -q install -y find wine-staging wine-staging-32bit wget make p7zip tar gzip || true - make -f CI.mk windeploy - make -f CI.mk finalize artifacts: diff --git a/CI.mk b/CI.mk index 49da9a9..e9ba039 100644 --- a/CI.mk +++ b/CI.mk @@ -92,6 +92,7 @@ zlib/build/libzlib.dll: zlib/CMakeLists.txt quazip/quazip.pro: git clone https://github.com/stachenov/quazip.git + cd quazip && git checkout v0.9.x quazip/build/release/quazip.dll: quazip/quazip.pro mkdir -p quazip/build