From 942f3ed5e4b06e70606e29216c4d72a287e03717 Mon Sep 17 00:00:00 2001 From: Frans de Jonge Date: Wed, 13 Mar 2019 14:46:20 +0100 Subject: [PATCH] [chore, CI] Update to Docker koappimage 0.1.3 for Ubuntu 16.04 (#4296) --- .ci/before_install.sh | 8 ++++---- .circleci/config.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.ci/before_install.sh b/.ci/before_install.sh index f302b7168..986092d76 100755 --- a/.ci/before_install.sh +++ b/.ci/before_install.sh @@ -2,14 +2,14 @@ # don't do this for clang if [ "$CXX" = "g++" ]; then - export CXX="g++-4.8" CC="gcc-4.8" + export CXX="g++-5" CC="gcc-5" fi # in case anything ignores the environment variables, override through PATH mkdir bin -ln -s "$(which gcc-4.8)" bin/cc -ln -s "$(which gcc-4.8)" bin/gcc +ln -s "$(which gcc-5)" bin/cc +ln -s "$(which gcc-5)" bin/gcc ln -s "$(which c++)" bin/c++ -ln -s "$(which g++-4.8)" bin/g++ +ln -s "$(which g++-5)" bin/g++ # Travis only makes a shallow clone of --depth=50. KOReader is small enough that # we can just grab it all. This is necessary to generate the version number, diff --git a/.circleci/config.yml b/.circleci/config.yml index a4453a02a..2689a6ddb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: houqp/kobase:0.0.5 + - image: frenzie/koappimage:0.1.3 environment: EMULATE_READER: 1 # this is for shellcheck 0.4.5 and lower; can be removed for 0.4.6