Unified Diff: .travis.yml
Issue 29783566:
Issue 6596 - update to work with v8 6.7.288.11 (Closed)
Base URL: https://github.com/adblockplus/libadblockplus@99836840e314b7941fdb51cb2b91f23ca3ee3414
Patch Set:
Created May 16, 2018, 10:17 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
.travis/prepare-prebuilt-v8.sh » ('j')
|
README.md » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: .travis.yml |
| diff --git a/.travis.yml b/.travis.yml |
| index 20e3d333e27eaf143e866fa2f1ea3d6366e74c21..3fc2499d916334f508f36eba6a4cf1186eeacd75 100644 |
| --- a/.travis.yml |
| +++ b/.travis.yml |
| @@ -22,26 +22,26 @@ python: '2.7' |
| env: |
| global: |
| - - URL_PREFIX=https://v8.eyeofiles.com/v8-3cdaf01c4043e19965efc5ef48df5314960b898f/ |
| + - URL_PREFIX=https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b541792669a/ |
| + - ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b |
| matrix: |
| - BUILD_ACTION=test |
| - - BUILD_ACTION=android_arm ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b |
| - - BUILD_ACTION=android_x86 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b |
| - - BUILD_ACTION=android_arm64 ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b |
| + - BUILD_ACTION=all TARGET_OS=android Configuration=release TARGET_ARCH=arm |
| + - BUILD_ACTION=all TARGET_OS=android Configuration=release TARGET_ARCH=arm64 |
| + - BUILD_ACTION=all TARGET_OS=android Configuration=release TARGET_ARCH=ia32 |
| before_script: |
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi |
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install p7zip; fi |
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=g++-7 CC=gcc-7; fi |
| - bash .travis/prepare-prebuilt-v8.sh |
| - - sed -i.bak '/third_party\/v8/d' dependencies |
| - ./ensure_dependencies.py |
| - - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip -O third_party/android-ndk.zip ; fi |
| - - if [[ -n "$ANDROID_NDK_ROOT" && "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip -O third_party/android-ndk.zip ; fi |
| - - if [[ -n "$ANDROID_NDK_ROOT" ]]; then unzip -q third_party/android-ndk.zip -d third_party/ ; fi |
| + - if [[ "${TARGET_OS}" == "android" && "$TRAVIS_OS_NAME" == "linux" ]]; then wget https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip -O third_party/android-ndk.zip ; fi |
| + - if [[ "${TARGET_OS}" == "android" && "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip -O third_party/android-ndk.zip ; fi |
| + - if [[ "${TARGET_OS}" == "android" ]]; then unzip -q third_party/android-ndk.zip -d third_party/ ; fi |
| script: |
| - - travis_wait 30 make ${BUILD_ACTION} LIBV8_LIB_DIR=../third_party/prebuilt-v8/ LIBV8_INCLUDE_DIR=third_party/prebuilt-v8/include |
| + - make ${BUILD_ACTION} LIBV8_LIB_DIR=../third_party/prebuilt-v8/ LIBV8_INCLUDE_DIR=third_party/prebuilt-v8/include |
| notifications: |
| email: false |
« no previous file with comments
|
« no previous file
|
.travis/prepare-prebuilt-v8.sh » ('j')
|
README.md » ('J')
