Skip to content

Commit 59d52c3

Browse files
committed
Merge branch 'issue-14135-hub-travis-ci-for-different-v8' into 'master'
Issue 14135 (hub) - add travis-ci configuration for different V8 versions See merge request eyeo/adblockplus/libadblockplus!11
2 parents 127d0d0 + f15218b commit 59d52c3

3 files changed

Lines changed: 33 additions & 10 deletions

File tree

.travis.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,28 @@ python: '2.7'
2222

2323
env:
2424
global:
25-
- URL_PREFIX=https://v8.eyeofiles.com/v8-4fc9a2fe7f8a7ef1e7966185b39b3b541792669a/
25+
- URL_PREFIX=https://v8.eyeofiles.com/v8-${!V8_COMMIT}/
2626
- ANDROID_NDK_ROOT=${TRAVIS_BUILD_DIR}/third_party/android-ndk-r16b
2727
- libv8_show_warnings="true"
2828
matrix:
29-
- BUILD_ACTION=test
30-
- BUILD_ACTION=all TARGET_OS=android Configuration=release ABP_TARGET_ARCH=arm
31-
- BUILD_ACTION=all TARGET_OS=android Configuration=release ABP_TARGET_ARCH=arm64
32-
- BUILD_ACTION=all TARGET_OS=android Configuration=release ABP_TARGET_ARCH=ia32
29+
# 6.7.288.11
30+
- V8_COMMIT=4fc9a2fe7f8a7ef1e7966185b39b3b541792669a ABP_OS_SCRIPT=nix
31+
- V8_COMMIT=4fc9a2fe7f8a7ef1e7966185b39b3b541792669a ABP_OS_SCRIPT=android
32+
# https://github.com/adblockplus/v8-googlesource/commit/3cdaf01c4043e19965efc5ef48df5314960b898f
33+
# 6.5.254.41
34+
- V8_COMMIT=3cdaf01c4043e19965efc5ef48df5314960b898f ABP_OS_SCRIPT=nix
35+
- V8_COMMIT=3cdaf01c4043e19965efc5ef48df5314960b898f ABP_OS_SCRIPT=android
3336

3437
before_script:
3538
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
3639
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install p7zip; fi
37-
- make get-prebuilt-v8
3840
- ./ensure_dependencies.py
39-
- 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
40-
- 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
41-
- if [[ "${TARGET_OS}" == "android" ]]; then unzip -q third_party/android-ndk.zip -d third_party/ ; fi
41+
- if [[ "${ABP_OS_SCRIPT}" == "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
42+
- if [[ "${ABP_OS_SCRIPT}" == "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
43+
- if [[ "${ABP_OS_SCRIPT}" == "android" ]]; then unzip -q third_party/android-ndk.zip -d third_party/ ; fi
4244

4345
script:
44-
- make ${BUILD_ACTION}
46+
- bash ./.travis/${ABP_OS_SCRIPT}-script.sh
4547

4648
notifications:
4749
email: false

.travis/android-script.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/env bash
2+
3+
set -x
4+
set -e
5+
6+
export Configuration=release
7+
export TARGET_OS=android
8+
ABP_TARGET_ARCHES=("arm" "arm64" "ia32")
9+
for ABP_TARGET_ARCH in "${ABP_TARGET_ARCHES[@]}"
10+
do
11+
export ABP_TARGET_ARCH=${ABP_TARGET_ARCH}
12+
make get-prebuilt-v8
13+
make all
14+
done

.travis/nix-script.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
set -x
4+
set -e
5+
6+
make get-prebuilt-v8
7+
make test

0 commit comments

Comments
 (0)