Skip to content

Commit b7df15e

Browse files
abby-sergzxxxz
authored andcommitted
resort CI tasks for travis
1 parent 127d0d0 commit b7df15e

3 files changed

Lines changed: 27 additions & 9 deletions

File tree

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,19 @@ env:
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+
- ABP_OS_SCRIPT=nix
30+
- ABP_OS_SCRIPT=android
3331

3432
before_script:
3533
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
3634
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install p7zip; fi
37-
- make get-prebuilt-v8
3835
- ./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
36+
- 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
37+
- 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
38+
- if [[ "${ABP_OS_SCRIPT}" == "android" ]]; then unzip -q third_party/android-ndk.zip -d third_party/ ; fi
4239

4340
script:
44-
- make ${BUILD_ACTION}
41+
- bash ./.travis/${ABP_OS_SCRIPT}-script.sh
4542

4643
notifications:
4744
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)