Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: .travis.yml

Issue 29748587: Issue 6063, 6531 - Update V8 to 6.5.254.41, use C++14 and NDK-r16b (Closed) Base URL: https://github.com/adblockplus/libadblockplus@549616e865707b89e95659d55c70e22d63130ce5
Left Patch Set: fix for android and set proper V8 commits Created April 18, 2018, 3:26 p.m.
Right Patch Set: fix and simplify build for Windows Created April 18, 2018, 6:41 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | Makefile » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 language: cpp 1 language: cpp
2 2
3 os: 3 os:
4 - linux 4 - linux
5 - osx 5 - osx
6 6
7 dist: trusty 7 dist: trusty
8 sudo: false 8 sudo: false
9 9
10 addons: 10 addons:
11 apt: 11 apt:
12 sources: 12 sources:
13 - 'ubuntu-toolchain-r-test' 13 - 'ubuntu-toolchain-r-test'
14 packages: 14 packages:
15 - g++-multilib 15 - g++-multilib
16 - binutils-gold 16 - binutils-gold
17 - libcurl4-openssl-dev 17 - libcurl4-openssl-dev
18 - g++-7 18 - g++-7
19 - p7zip-full 19 - p7zip-full
20 20
21 python: '2.7' 21 python: '2.7'
22 22
23 env: 23 env:
24 global: 24 global:
25 - URL_PREFIX=https://v8.eyeofiles.com/v8-9a4991959e231351e52266b631cbd36f8341b dc3/ 25 - URL_PREFIX=https://v8.eyeofiles.com/v8-3cdaf01c4043e19965efc5ef48df5314960b8 98f/
26 matrix: 26 matrix:
27 - BUILD_ACTION=test 27 - BUILD_ACTION=test
28 - BUILD_ACTION=android_arm ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/an droid-ndk-r12b 28 - BUILD_ACTION=android_arm ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/an droid-ndk-r16b
29 - BUILD_ACTION=android_x86 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/an droid-ndk-r12b 29 - BUILD_ACTION=android_x86 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/an droid-ndk-r16b
30 - BUILD_ACTION=android_arm64 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/ android-ndk-r12b 30 - BUILD_ACTION=android_arm64 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/ android-ndk-r16b
31 31
32 before_script: 32 before_script:
33 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi 33 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
34 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install p7zip; fi 34 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install p7zip; fi
35 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-7 CC=gcc-7; fi 35 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-7 CC=gcc-7; fi
36 - bash .travis/prepare-prebuilt-v8.sh 36 - bash .travis/prepare-prebuilt-v8.sh
37 - sed -i.bak '/third_party\/v8/d' dependencies 37 - sed -i.bak '/third_party\/v8/d' dependencies
38 - ./ensure_dependencies.py 38 - ./ensure_dependencies.py
39 - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "linux" ]]; then wget h ttps://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip -O thi rd_party/android-ndk.zip ; fi 39 - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "linux" ]]; then wget h ttps://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip -O thi rd_party/android-ndk.zip ; fi
40 - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "osx" ]]; then wget htt ps://dl.google.com/android/repository/android-ndk-r12b-darwin-x86_64.zip -O thir d_party/android-ndk.zip ; fi 40 - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "osx" ]]; then wget htt ps://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip -O thir d_party/android-ndk.zip ; fi
41 - if [[ -n "$ANDROID_NDK_ROOT" ]]; then unzip -q third_party/android-ndk.zip - d third_party/ ; fi 41 - if [[ -n "$ANDROID_NDK_ROOT" ]]; then unzip -q third_party/android-ndk.zip - d third_party/ ; fi
42 42
43 script: 43 script:
44 - travis_wait 30 make ${BUILD_ACTION} LIBV8_LIB_DIR=../third_party/prebuilt-v8 / LIBV8_INCLUDE_DIR=third_party/prebuilt-v8/include 44 - travis_wait 30 make ${BUILD_ACTION} LIBV8_LIB_DIR=../third_party/prebuilt-v8 / LIBV8_INCLUDE_DIR=third_party/prebuilt-v8/include
45 45
46 notifications: 46 notifications:
47 email: false 47 email: false
LEFTRIGHT
« no previous file | Makefile » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld