build: gitlab-ci names for artifacts

* names for gitlab artifacts
* fix Linux package qt platforms lib
This commit is contained in:
Andreas Stallinger
2017-05-10 16:09:43 +02:00
parent 960ca6703e
commit d100aca5fc
3 changed files with 16 additions and 14 deletions
+9 -5
View File
@@ -12,11 +12,12 @@ Linux64:
- cd ./bin/test
- ../../build/Release/test/Sourcetrail_test
artifacts:
name: "$CI_JOB_NAME"
paths:
- distr/Sourcetrail*.tar.gz
- Sourcetrail*.tar.gz
expire_in: 3 days
Linux64_tagged:
Linux64_tag:
image: st4ll1/coati_linux_64
stage: deploy
only:
@@ -29,8 +30,9 @@ Linux64_tagged:
- cd ./bin/test
- ../../build/Release/test/Sourcetrail_test
artifacts:
name: "$CI_JOB_NAME"
paths:
- distr/Sourcetrail*.tar.gz
- Sourcetrail*.tar.gz
Linux32:
image: st4ll1/coati_linux_32
@@ -46,8 +48,9 @@ Linux32:
- cd ./bin/test
- ../../build/Release/test/Sourcetrail_test
artifacts:
name: "$CI_JOB_NAME"
paths:
- distr/Sourcetrail*.tar.gz
- Sourcetrail*.tar.gz
expire_in: 3 days
Linux32_tag:
@@ -63,5 +66,6 @@ Linux32_tag:
- cd ./bin/test
- ../../build/Release/test/Sourcetrail_test
artifacts:
name: "$CI_JOB_NAME"
paths:
- distr/Sourcetrail*.tar.gz
- Sourcetrail*.tar.gz
+5 -7
View File
@@ -96,13 +96,11 @@ function(AddSharedToComponent componentName)
GetAndInstallLibrary(libdrm.so ${componentName})
GetAndInstallLibrary(libXau.so ${componentName})
if ( $ENV{QT_DIR})
INSTALL(DIRECTORY
$ENV{QT_DIR}/plugins/platforms
DESTINATION Sourcetrail/lib
COMPONENT ${componentName}
)
endif()
INSTALL(DIRECTORY
$ENV{QT_DIR}/plugins/platforms
DESTINATION Sourcetrail/lib
COMPONENT ${componentName}
)
INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/app/user
DESTINATION Sourcetrail
+2 -2
View File
@@ -39,8 +39,8 @@ then
elif [ "$1" = "package" ] || [ "$1" = "p" ]
then
cmake --build build/Release --target package
mkdir -p distr && mv build/Release/Sourcetrail*.tar.gz distr #&& cp build/Release/Sourcetrail*.deb distr
echo "Packages copied into the distr folder"
mv build/Release/Sourcetrail*.tar.gz . #&& cp build/Release/Sourcetrail*.deb distr
echo "Packages copied into the root folder"
elif [ "$1" = "all" ] || [ "$1" = "a" ]
then
cmake --build build/Release --target all