Compare commits

..

2 Commits

Author SHA1 Message Date
Maurycy Liebner
ca94388a5f Do not setup clang as the default compiler in Travis. 2021-03-12 10:59:59 +01:00
Maurycy Liebner
d1be1b49c2 Clang-7 installation broken on Travis Xenial, try using the preinstalled
clang-7.
2021-03-12 10:53:17 +01:00
2 changed files with 2 additions and 3 deletions

View File

@ -9,10 +9,9 @@ matrix:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- 'llvm-toolchain-xenial-7'
- sourceline: 'ppa:jonathonf/ffmpeg-4' - sourceline: 'ppa:jonathonf/ffmpeg-4'
packages: packages:
- clang-7 g++-7 - g++-7
- libswresample-dev libswscale-dev libavcodec-dev libavformat-dev libavresample-dev - libswresample-dev libswscale-dev libavcodec-dev libavformat-dev libavresample-dev
- libglib2.0-dev - libglib2.0-dev
- unzip - unzip

View File

@ -14,7 +14,7 @@ if ! [ -d $TRAVIS_CACHE_DIR/third_party/skia/out/Release ]; then
wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip
unzip ninja-linux.zip unzip ninja-linux.zip
chmod +x ninja chmod +x ninja
bin/gn gen out/Release --args='is_official_build=true is_debug=false extra_cflags=["-Wno-error"] target_os="linux" target_cpu="x64" skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false skia_use_system_icu=false skia_use_system_harfbuzz=false cc="clang-7" cxx="clang++-7"' bin/gn gen out/Release --args='is_official_build=true is_debug=false extra_cflags=["-Wno-error"] target_os="linux" target_cpu="x64" skia_use_system_expat=false skia_use_system_freetype2=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false skia_use_system_icu=false skia_use_system_harfbuzz=false cc="clang" cxx="clang++"'
./ninja -C out/Release -j 2 skia ./ninja -C out/Release -j 2 skia
mkdir -p $TRAVIS_CACHE_DIR/third_party/skia/out/Release mkdir -p $TRAVIS_CACHE_DIR/third_party/skia/out/Release
cp -r ./out/Release/* $TRAVIS_CACHE_DIR/third_party/skia/out/Release cp -r ./out/Release/* $TRAVIS_CACHE_DIR/third_party/skia/out/Release