From 4f6f78680b9597d9fcea6a116e9252d935bc4a79 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 28 Aug 2019 17:57:12 -0700 Subject: [PATCH] Fix usage of BITNESS var --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60d278f..a899aa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,12 +28,12 @@ matrix: - name: "Android 32 bit" dist: trusty language: android - env: SPEC=android-clang CONFIG=installer BITNESS=32-bit + env: SPEC=android-clang CONFIG=installer BITNESS=32 sudo: false - name: "Android 64 bit" dist: trusty language: android - env: SPEC=android-clang CONFIG=installer BITNESS=64-bit + env: SPEC=android-clang CONFIG=installer BITNESS=64 sudo: false - name: "OSX Installer" os: osx @@ -102,14 +102,14 @@ install: ; fi - - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "64-bit" ]]; then + - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "64" ]]; then wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.4-android_arm64_v8a-min.tar.bz2 && tar jxf Qt5.12.4-android_arm64_v8a-min.tar.bz2 -C /tmp && export PATH=/tmp/Qt5.12-android_arm64_v8a/5.12.4/android_arm64_v8a/bin:$PATH ; fi - - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "32-bit" ]]; then + - if [[ "${SPEC}" = "android-clang" && "${BITNESS}" = "32" ]]; then wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.12.4-android_armv7-min.tar.bz2 && tar jxf Qt5.12.4-android_armv7-min.tar.bz2 -C /tmp && export PATH=/tmp/Qt5.12-android_armv7/5.12.4/android_armv7/bin:$PATH