Dusk/GitAddonsManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

CI: attempt to fix version name

Browse Source
This commit is contained in:
woblight
2018-07-17 16:03:46 +02:00
parent 692e65b14b
commit 41b38ff7cb
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+2 -3
View File
@@ -1,8 +1,5 @@
image: opensuse/tumbleweed image: opensuse/tumbleweed
variables:
GIT_DESCRIBE: 'git describe --tags'
cache: cache:
paths: paths:
- Qt/ - Qt/
@@ -13,6 +10,7 @@ cache:
Linux_x64: Linux_x64:
before_script: 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 - 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
- export GIT_DESCRIBE=$(git describe --tags)
stage: build stage: build
script: script:
- make -f CI.mk build - make -f CI.mk build
@@ -25,6 +23,7 @@ Win32:
stage: build stage: build
before_script: before_script:
- zypper -q install -y wine-staging wine-staging-32bit wget make p7zip tar git - zypper -q install -y wine-staging wine-staging-32bit wget make p7zip tar git
- export GIT_DESCRIBE=$(git describe --tags)
script: script:
- make -f CI.mk windeploy - make -f CI.mk windeploy
artifacts: artifacts: