summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-09-30 17:48:02 +0100
committerEmīls Piņķis <emils@mullvad.net>2019-10-01 12:58:41 +0100
commit8ce960eea009380d3d303cdf2ddd9ea2b8a4444e (patch)
tree395de0aba25b75f291bf27d1fbe882af726e7936
parentcb9b4e0b6242e2152cea4dd72e06a26491f9a3d3 (diff)
downloadmullvadvpn-8ce960eea009380d3d303cdf2ddd9ea2b8a4444e.tar.xz
mullvadvpn-8ce960eea009380d3d303cdf2ddd9ea2b8a4444e.zip
Add ktlint to android travis job
-rw-r--r--.travis.yml6
1 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 6996f7d306..5c4f4c2844 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,10 @@ matrix:
- sudo unzip -q -d /opt/android/ /tmp/ndk.zip
- sudo /opt/android/android-ndk-r20/build/tools/make-standalone-toolchain.sh --platform=android-21 --arch=arm64 --install-dir=/opt/android/toolchains/android21-aarch64
- |
+ curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.34.2/ktlint &&
+ chmod a+x ktlint &&
+ sudo mv ktlint /usr/local/bin/
+ - |
cat >> $HOME/.cargo/config << EOF
[target.aarch64-linux-android]
ar = "/opt/android/android-ndk-r20/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android-ar"
@@ -53,6 +57,8 @@ matrix:
- cargo build --target aarch64-linux-android --verbose
- cd android
- ./gradlew --console plain assembleDebug
+ # Run ktlint with extra andorid rules
+ - ktlint -a
# Daemon - macOS
- language: rust