updated travis script

.travis.yml

@@ -50,38 +50,19 @@ before_install:
   - openssl aes-256-cbc -K $encrypted_9b8203f9524d_key -iv $encrypted_9b8203f9524d_iv -in travis/configs/twidere_private_config.tar.gz.enc -out travis/configs/twidere_private_config.tar.gz -d
 
 install:
-  # Extracts build configs into source tree
-  - tar zxf travis/configs/twidere_private_config.tar.gz
-  # Make sure ~/.ssh/ exists
-  - mkdir -p ~/.ssh/
-  # Make it secure
-  - chmod 700 ~/.ssh/
-  # Append ssh_config
-  - cat private/ssh_config >> ~/.ssh/config
-  # Append known_hosts
-  - cat private/ssh_known_hosts >> ~/.ssh/known_hosts
-  # Clone Google components
-  - ssh-agent bash -c "ssh-add private/ssh_id_rsa; git clone $COMPONENT_GOOGLE_REPO twidere/src/google" > /dev/null 2>&1
-  # Force reset to required commit id
-  - git -C twidere/src/google reset --hard `cat twidere/src/.google.commit-id` > /dev/null 2>&1
-  # Dropbox accessToken for uploading logs
-  - cat private/dropbox_uploader >> ~/.dropbox_uploader
+  - ./travis/scripts/fetch_private_files.sh
 
 before_script:
   # Validate if patches work
   - patch --dry-run -d twidere < twidere/patches/remove_closed_source_dependencies.patch
   # Validate if Google components fetched successfully
-  - test -f twidere/src/google/AndroidManifest.xml
+  - ./travis/scripts/test_private_files.sh
 
 script:
   - ./gradlew clean build
 
 after_failure:
-  - curl "https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh" -o travis/scripts/dropbox_uploader.sh
-  - chmod +x travis/scripts/dropbox_uploader.sh
-  - find /tmp -maxdepth 1 -name 'kotlin-daemon.*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/$(basename $1)' find-sh {} \;
-  - find ~/.gradle/daemon/ -name 'daemon-*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/gradle-$(basename $1)' find-sh {} \;
-  - dmesg > dmesg.log; travis/scripts/dropbox_uploader.sh upload dmesg.log $TRAVIS_BUILD_ID/dmesg.log
+  - ./travis/scripts/upload_error_logs.sh
 
 deploy:
   - provider: releases

travis/scripts/fetch_private_files.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      return 0
+fi
+
+# Extracts build configs into source tree
+tar zxf travis/configs/twidere_private_config.tar.gz
+# Make sure ~/.ssh/ exists
+mkdir -p ~/.ssh/
+# Make it secure
+chmod 700 ~/.ssh/
+# Append ssh_config
+cat private/ssh_config >> ~/.ssh/config
+# Append known_hosts
+cat private/ssh_known_hosts >> ~/.ssh/known_hosts
+# Clone Google components
+ssh-agent bash -c "ssh-add private/ssh_id_rsa; git clone $COMPONENT_GOOGLE_REPO twidere/src/google" > /dev/null 2>&1
+# Force reset to required commit id
+git -C twidere/src/google reset --hard `cat twidere/src/.google.commit-id` > /dev/null 2>&1
+# Dropbox accessToken for uploading logs
+cat private/dropbox_uploader >> ~/.dropbox_uploader

travis/scripts/test_private_files.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+    return 0
+fi
+
+test -f twidere/src/google/AndroidManifest.xml

travis/scripts/upload_error_logs.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
+      return 0
+fi
+
+curl 'https://raw.githubusercontent.com/andreafabrizi/Dropbox-Uploader/master/dropbox_uploader.sh' -o travis/scripts/dropbox_uploader.sh
+chmod +x travis/scripts/dropbox_uploader.sh
+find /tmp -maxdepth 1 -name 'kotlin-daemon.*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/$(basename $1)' find-sh {} \;
+find ~/.gradle/daemon/ -name 'daemon-*.log' -exec sh -c 'travis/scripts/dropbox_uploader.sh upload $1 $TRAVIS_BUILD_ID/gradle-$(basename $1)' find-sh {} \;
+dmesg > dmesg.log; travis/scripts/dropbox_uploader.sh upload dmesg.log ${TRAVIS_BUILD_ID}/dmesg.log