Skip to content
Snippets Groups Projects
Commit bd88aa14 authored by Tomáš Pecka's avatar Tomáš Pecka Committed by Jan Trávníček
Browse files

CI: Small improvements to CI conf

parent d88384ed
No related branches found
No related tags found
1 merge request!51Cmake sanitizer
Pipeline #28151 passed
...@@ -29,10 +29,6 @@ stages: ...@@ -29,10 +29,6 @@ stages:
   
.build:push: &build-push .build:push: &build-push
<<: *build <<: *build
image: alpine:edge
before_script:
- apk add --no-cache bash build-base cmake python3 libexecinfo-dev cppunit-dev libxml2-dev tclap-dev readline-dev qt5-qtbase-dev graphviz-dev jsoncpp-dev ${EXTRA_PKGS}
- export CXX=${CXX}
except: except:
variables: variables:
- $SCHEDULED_NIGHTLY - $SCHEDULED_NIGHTLY
...@@ -45,13 +41,16 @@ stages: ...@@ -45,13 +41,16 @@ stages:
   
build:alpine:gcc: build:alpine:gcc:
<<: *build-push <<: *build-push
variables: image: alpine:edge
CXX: g++ before_script:
- apk add --no-cache bash build-base cmake python3 libexecinfo-dev cppunit-dev libxml2-dev tclap-dev readline-dev qt5-qtbase-dev graphviz-dev jsoncpp-dev
   
build:alpine:clang: build:alpine:clang:
<<: *build-push <<: *build-push
image: alpine:edge
before_script:
- apk add --no-cache bash build-base cmake python3 libexecinfo-dev cppunit-dev libxml2-dev tclap-dev readline-dev qt5-qtbase-dev graphviz-dev jsoncpp-dev clang
variables: variables:
EXTRA_PKGS: clang
CXX: clang++ CXX: clang++
   
# build:debian:stable: # build:debian:stable:
...@@ -133,9 +132,6 @@ build:doc: ...@@ -133,9 +132,6 @@ build:doc:
   
.test:push: &test-push .test:push: &test-push
<<: *test <<: *test
image: alpine:edge
before_script:
- apk add --no-cache bash bc coreutils python3 cmake make libexecinfo cppunit libxml2 tclap readline qt5-qtbase qt5-qtbase-x11 graphviz jsoncpp
except: except:
variables: variables:
- $SCHEDULED_NIGHTLY - $SCHEDULED_NIGHTLY
...@@ -148,11 +144,17 @@ build:doc: ...@@ -148,11 +144,17 @@ build:doc:
   
test:alpine:gcc: test:alpine:gcc:
<<: *test-push <<: *test-push
image: alpine:edge
before_script:
- apk add --no-cache bash bc coreutils python3 cmake make libexecinfo cppunit libxml2 tclap readline qt5-qtbase qt5-qtbase-x11 graphviz jsoncpp
dependencies: dependencies:
- build:alpine:gcc - build:alpine:gcc
   
test:alpine:clang: test:alpine:clang:
<<: *test-push <<: *test-push
image: alpine:edge
before_script:
- apk add --no-cache bash bc coreutils python3 cmake make libexecinfo cppunit libxml2 tclap readline qt5-qtbase qt5-qtbase-x11 graphviz jsoncpp
dependencies: dependencies:
- build:alpine:clang - build:alpine:clang
   
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment