LBRYCommunity/lbry-android
1
0
Fork 0
Code Issues 155 Pull requests 6 Projects Releases 84 Packages Wiki Activity

Instant verification #974

Merged
akinwale merged 5 commits from instant-verification into master 2020-08-19 18:23:36 +02:00
Conversation 0 Commits 5 Files changed 29 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 0b7e596ff2 - Show all commits

6
.gitlab-ci.yml
View file

@ -11,7 +11,7 @@ build apk:
- apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign - apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign
- chmod u+x $CI_PROJECT_DIR/gradlew - chmod u+x $CI_PROJECT_DIR/gradlew
- export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23 - export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23
- export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1) - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain | tail -1)
artifacts: artifacts:
paths: paths:
- bin/browser-*-release__arm.apk - bin/browser-*-release__arm.apk
@ -39,7 +39,7 @@ deploy build.lbry.io:
- apt-get -y update && apt-get -y install openjdk-8-jdk - apt-get -y update && apt-get -y install openjdk-8-jdk
- pip install awscli - pip install awscli
- chmod u+x $CI_PROJECT_DIR/gradlew - chmod u+x $CI_PROJECT_DIR/gradlew
- export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1) - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain | tail -1)
- export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk
- export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk
script: script:
@ -58,7 +58,7 @@ release apk:
- apt-get -y update && apt-get -y install openjdk-8-jdk - apt-get -y update && apt-get -y install openjdk-8-jdk
- pip install awscli githubrelease - pip install awscli githubrelease
- chmod u+x $CI_PROJECT_DIR/gradlew - chmod u+x $CI_PROJECT_DIR/gradlew
- export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1) - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain | tail -1)
- export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk
- export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk
script: script:

2
app/build.gradle
View file

@ -2,7 +2,7 @@ import com.google.gms.googleservices.GoogleServicesPlugin
Properties twitterProps = new Properties() Properties twitterProps = new Properties()
try { try {
twitterProps.load(file('twitter.properties').newDataInputStream()) twitterProps.load(project.file('twitter.properties').newDataInputStream())
} catch (Exception ex) { } catch (Exception ex) {
throw new GradleException("Missing twitter.properties.") throw new GradleException("Missing twitter.properties.")
} }