From 2d3d536e6d994afb691af87ea78a8e8810d856e0 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Wed, 1 Mar 2017 14:32:55 +0800 Subject: [PATCH] updated build config --- .gitignore | 5 ++--- .travis.yml | 2 +- build.gradle | 2 +- .../configs/twidere_private_config.tar.gz.enc | Bin 4032 -> 4848 bytes 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 4f89c76d3..0ed3a5265 100644 --- a/.gitignore +++ b/.gitignore @@ -24,8 +24,7 @@ ehthumbs.db Thumbs.db # Private files -/signing.properties -/twidere.jks -/priv_components_ssh_key +/private +# Local files /captures \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 1d5702ba5..72bdf1e19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ before_install: install: # Extracts build configs into source tree - tar zxf travis/configs/twidere_private_config.tar.gz - - GIT_SSH_COMMAND='ssh -i priv_components_ssh_key' git clone $COMPONENT_GOOGLE_REPO twidere/src/google > /dev/null 2>&1 + - GIT_SSH_COMMAND='ssh -i private/ssh_id_rsa -o UserKnownHostsFile private/ssh_known_hosts' git clone $COMPONENT_GOOGLE_REPO twidere/src/google > /dev/null 2>&1 before_script: # Validate if patches work diff --git a/build.gradle b/build.gradle index 0d82c1da0..409f64f7a 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ subprojects { if (android.hasProperty('buildTypes') && project.plugins.hasPlugin('com.android.application')) { android.buildTypes.each { buildType -> - def file = rootProject.file('signing.properties') + def file = rootProject.file('private/signing.properties') if (file.exists()) { def cfg = signingConfigs.maybeCreate(buildType.name) loadSigningConfig(cfg, file) diff --git a/travis/configs/twidere_private_config.tar.gz.enc b/travis/configs/twidere_private_config.tar.gz.enc index 7c0b6ba8fe7cb729378d4169da8e8b8c6de4a1b7..e553529d12507ac6a25ff525cd4de6d1f1c42bcc 100644 GIT binary patch literal 4848 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 W3%-a_5NXs6`Msw@tNm5@k>OUAs!t&R literal 4032 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