From c161fd3d0c6f4a55e9285ad97eabd357c0edac7f Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Wed, 20 Jun 2018 10:54:36 +0200
Subject: [PATCH] upgrade to alpine 3.7
---
.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb427eb559..64bde69775 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,18 +5,18 @@
# files implicitly passed between jobs or stages, only artifacts and maybe
# cache (depends on configuration).
-image: alpine:3.6
+image: alpine:3.7
before_script:
- case "$CI_BUILD_NAME" in
- *-clang) export CXX=clang++ EXTRA_PKGS="$EXTRA_PKGS clang llvm4-dev";;
+ *-clang) export CXX=clang++ EXTRA_PKGS="$EXTRA_PKGS clang llvm5-dev";;
*) export CXX=g++;;
esac
- export JOBS=$(grep -c processor /proc/cpuinfo)
- apk add --no-cache build-base bash libexecinfo-dev
cppunit-dev libxml2-dev tclap-dev readline-dev $EXTRA_PKGS
- case "$CI_BUILD_NAME" in
- *-clang) ln -s /usr/lib/llvm4/lib/LLVMgold.so /usr/lib/LLVMgold.so;;
+ *-clang) ln -s /usr/lib/llvm5/lib/LLVMgold.so /usr/lib/LLVMgold.so;;
*) ;;
esac
- echo USE_RAMDISK=0 >> build.conf
--
GitLab