From c45092018609940997ab5f60c9eb50d1db0a8a89 Mon Sep 17 00:00:00 2001 From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz> Date: Wed, 26 Apr 2017 21:52:28 +0200 Subject: [PATCH] use clang from edge alpine linux release --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ad5cd610b..d15adad01a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,12 +7,13 @@ before_script: - case "$CI_BUILD_NAME" in - *-clang) export CXX=clang++ EXTRA_PKGS="$EXTRA_PKGS clang";; + *-clang) export CXX=clang++ EXTRA_PKGS="$EXTRA_PKGS clang@edge2";; *) export CXX=g++;; esac - export JOBS=$(grep -c processor /proc/cpuinfo) - # XXX: Remove after Alpine v3.6 is released and rename tclap-dev@edge to tclap-dev. + # XXX: Remove after Alpine v3.6 is released and rename tclap-dev@edge to tclap-dev and clang@edge2 to clang. - echo '@edge http://repository.fit.cvut.cz/mirrors/alpine/edge/community' >> /etc/apk/repositories + - echo '@edge2 http://repository.fit.cvut.cz/mirrors/alpine/edge/main' >> /etc/apk/repositories - apk add --no-cache build-base bash libexecinfo-dev cppunit-dev libxml2-dev tclap-dev@edge $EXTRA_PKGS -- GitLab