diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-04-14 12:11:54 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-04-14 12:11:54 +0200 |
| commit | f94a9582ee6385cbb98f93a8cd7fb1213f1521e4 (patch) | |
| tree | 27df8669985688d678b62665738d49156f5aaacb | |
| parent | 137e3304bdb56cfd53db3c025374916d209b6480 (diff) | |
| parent | 71a67dc89c09127de0d3fb52b21c66045c7f9d1b (diff) | |
| download | mullvadvpn-f94a9582ee6385cbb98f93a8cd7fb1213f1521e4.tar.xz mullvadvpn-f94a9582ee6385cbb98f93a8cd7fb1213f1521e4.zip | |
Merge branch 'run-android-first-on-ci'
| -rw-r--r-- | .travis.yml | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/.travis.yml b/.travis.yml index 83ffb835cc..ed1c113976 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,36 @@ matrix: - npm run build - npm test + # Android + - language: android + sudo: true + android: + components: + - android-28 + - build-tools-28.0.3 + install: + - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y + - source $HOME/.cargo/env + - rustup target add aarch64-linux-android + - curl -sf -L -o /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-r19b-linux-x86_64.zip + - sudo mkdir /opt/android + - sudo unzip -q -d /opt/android/ /tmp/ndk.zip + - sudo /opt/android/android-ndk-r19b/build/tools/make-standalone-toolchain.sh --platform=android-28 --arch=arm64 --install-dir=/opt/android/toolchains/android28-aarch64 + - | + cat >> $HOME/.cargo/config << EOF + [target.aarch64-linux-android] + ar = "/opt/android/android-ndk-r19b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar" + linker = "/opt/android/android-ndk-r19b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang" + before_script: + - export RUSTFLAGS="--deny unused_imports --deny dead_code" + - export AR_aarch64_linux_android=/opt/android/toolchains/android28-aarch64/bin/aarch64-linux-android-ar + - export CC_aarch64_linux_android=/opt/android/toolchains/android28-aarch64/bin/aarch64-linux-android28-clang + - source env.sh android + - env + script: + - cargo build --target aarch64-linux-android --verbose + - cd android + - ./gradlew --console plain assembleDebug # Daemon - macOS - language: rust @@ -71,37 +101,6 @@ matrix: before_script: *rust_before_script script: *rust_script - # Android - - language: android - sudo: true - android: - components: - - android-28 - - build-tools-28.0.3 - install: - - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain stable -y - - source $HOME/.cargo/env - - rustup target add aarch64-linux-android - - curl -sf -L -o /tmp/ndk.zip https://dl.google.com/android/repository/android-ndk-r19b-linux-x86_64.zip - - sudo mkdir /opt/android - - sudo unzip -q -d /opt/android/ /tmp/ndk.zip - - sudo /opt/android/android-ndk-r19b/build/tools/make-standalone-toolchain.sh --platform=android-28 --arch=arm64 --install-dir=/opt/android/toolchains/android28-aarch64 - - | - cat >> $HOME/.cargo/config << EOF - [target.aarch64-linux-android] - ar = "/opt/android/android-ndk-r19b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar" - linker = "/opt/android/android-ndk-r19b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android28-clang" - before_script: - - export RUSTFLAGS="--deny unused_imports --deny dead_code" - - export AR_aarch64_linux_android=/opt/android/toolchains/android28-aarch64/bin/aarch64-linux-android-ar - - export CC_aarch64_linux_android=/opt/android/toolchains/android28-aarch64/bin/aarch64-linux-android28-clang - - source env.sh android - - env - script: - - cargo build --target aarch64-linux-android --verbose - - cd android - - ./gradlew --console plain assembleDebug - notifications: email: |