2
0
mirror of https://github.com/koreader/koreader synced 2024-10-31 21:20:20 +00:00

[chore, CI] Update to Docker koappimage 0.1.3 for Ubuntu 16.04 (#4296)

This commit is contained in:
Frans de Jonge 2019-03-13 14:46:20 +01:00 committed by GitHub
parent 14c705f11b
commit 942f3ed5e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -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,

View File

@ -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