diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d97727..f0610fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ +image: opensuse/tumbleweed + before_script: - - dpkg --add-architecture i386 - - apt-get update -qq && apt-get install -y -qq wine wine32 git qt5-qmake qt5-default qtdeclarative5-dev qtbase5-dev qtquickcontrols2-5-dev libgit2-dev qtbase5-dev libqt5concurrent5 make gcc g++ p7zip + - zypper dup -q && zypper install -y -q wine wine-32bit git libgit2-dev make gcc gcc-g++ p7zip libQt5Concurrent-devel libQt5Core-devel libQt5Gui-devel libQt5QuickControls2-devel libqt5-qtbase-devel libqt5-qtdeclarative-devel cache: paths: diff --git a/CI.mk b/CI.mk index 28b0fd8..60f778f 100644 --- a/CI.mk +++ b/CI.mk @@ -11,7 +11,7 @@ qmake_opts="QMAKE_INCDIR+=Z:$(pwd)/libgit2-0.27.2/include" "QMAKE_LIBDIR+=Z:$(pw qmake=$(wine) $(pwd)/Qt/5.11.1/mingw53_32/bin/qmake.exe build: - qmake . -o build/Makefile + qmake-qt5 . -o build/Makefile make -C build cmake-3.12.0-rc3-win32-x86.msi: