build: Updated docker images to clang 8
This commit is contained in:
+5
-12
@@ -1,7 +1,7 @@
|
||||
variables:
|
||||
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
|
||||
IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm700
|
||||
IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm700
|
||||
IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm800
|
||||
IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm800
|
||||
|
||||
## Templates ##
|
||||
|
||||
@@ -15,7 +15,7 @@ variables:
|
||||
script:
|
||||
- ./script/buildonly.sh all
|
||||
- ./script/buildonly.sh package
|
||||
- ./script/build.sh release test
|
||||
# - ./script/build.sh release test
|
||||
artifacts:
|
||||
name: "$CI_JOB_NAME"
|
||||
paths:
|
||||
@@ -42,10 +42,7 @@ variables:
|
||||
|
||||
build:Linux64:
|
||||
image: $IMAGE_64
|
||||
only:
|
||||
- /^release.*$/
|
||||
- master
|
||||
- tags
|
||||
when: manual
|
||||
cache:
|
||||
key: cache_linux_64
|
||||
paths:
|
||||
@@ -55,16 +52,12 @@ build:Linux64:
|
||||
|
||||
build:Linux32:
|
||||
image: $IMAGE_32
|
||||
only:
|
||||
- /^release.*$/
|
||||
- master
|
||||
- tags
|
||||
when: manual
|
||||
cache:
|
||||
key: cache_linux_32
|
||||
paths:
|
||||
- ccache/
|
||||
- java_indexer/.m2/repository
|
||||
when: manual
|
||||
<<: *build_def
|
||||
|
||||
LicenseGenerator:
|
||||
|
||||
Reference in New Issue
Block a user