From e02dd2ab2c3af1751f5f337af3520ffb599f5c5a Mon Sep 17 00:00:00 2001 From: woblight Date: Tue, 17 Jul 2018 16:56:06 +0200 Subject: [PATCH] CI: attempt to fix version name 3 --- .gitlab-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51f2b1b..815770f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,10 +5,9 @@ before_script: - export GIT_DESCRIBE=$(git describe --tags) Linux_x64: - before_script: - - zypper -q install -y git libgit2-devel make gcc gcc-c++ libQt5Concurrent-devel libQt5Core-devel libQt5Gui-devel libQt5QuickControls2-devel libqt5-qtbase-devel libqt5-qtdeclarative-devel 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 - make -f CI.mk build artifacts: paths: @@ -23,10 +22,8 @@ Win32: - libgit2-0.27.2 - mingw32 stage: build - before_script: - - zypper -q install -y wine-staging wine-staging-32bit wget make p7zip tar git - - export GIT_DESCRIBE=$(git describe --tags) script: + - zypper -q install -y wine-staging wine-staging-32bit wget make p7zip tar - make -f CI.mk windeploy artifacts: paths: