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

Gradle fix #978

Merged
akinwale merged 6 commits from gradle-fix into master 2020-08-19 19:09:37 +02:00
Conversation 0 Commits 6 Files changed 3 +14 -12
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 9ad4af12e6 - Show all commits

26
.gitlab-ci.yml
View file

@ -8,10 +8,12 @@ build apk:
stage: build stage: build
image: lbry/android-base:platform-28 image: lbry/android-base:platform-28
before_script: before_script:
- apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
- echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
- wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
- apt-get -y update && apt-get -y install build-essential ca-certificates curl git gpg-agent openjdk-8-jdk software-properties-common wget zipalign git-secret
- git secret reveal
- chmod u+x $CI_PROJECT_DIR/gradlew - chmod u+x $CI_PROJECT_DIR/gradlew
- export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23
- $CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain
- export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -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:
@ -20,11 +22,7 @@ build apk:
expire_in: 1 week expire_in: 1 week
script: script:
- export PATH=/usr/bin:$PATH - export PATH=/usr/bin:$PATH
- echo "$PGP_PRIVATE_KEY" | gpg --batch --import - export ANDROID_SDK_ROOT=~/.buildozer/android/platform/android-sdk-23
- echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
- wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
- apt-get -y update && apt-get -y install git-secret
- git secret reveal
- chmod u+x ./release.sh - chmod u+x ./release.sh
- ./release.sh - ./release.sh
- cp bin/browser-$BUILD_VERSION-release__arm.apk $CI_PROJECT_DIR - cp bin/browser-$BUILD_VERSION-release__arm.apk $CI_PROJECT_DIR
@ -36,10 +34,12 @@ deploy build.lbry.io:
dependencies: dependencies:
- build apk - build apk
before_script: before_script:
- apt-get -y update && apt-get -y install openjdk-8-jdk - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
- echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
- wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
- apt-get -y update && apt-get -y install openjdk-8-jdk git-secret
- pip install awscli - pip install awscli
- chmod u+x $CI_PROJECT_DIR/gradlew - chmod u+x $CI_PROJECT_DIR/gradlew
- $CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain
- export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -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
@ -56,10 +56,12 @@ release apk:
dependencies: dependencies:
- build apk - build apk
before_script: before_script:
- apt-get -y update && apt-get -y install openjdk-8-jdk - echo "$PGP_PRIVATE_KEY" | gpg --batch --import
- echo "deb https://dl.bintray.com/sobolevn/deb git-secret main" | tee -a /etc/apt/sources.list
- wget -O - https://api.bintray.com/users/sobolevn/keys/gpg/public.key | apt-key add -
- apt-get -y update && apt-get -y install openjdk-8-jdk git-secret
- pip install awscli githubrelease - pip install awscli githubrelease
- chmod u+x $CI_PROJECT_DIR/gradlew - chmod u+x $CI_PROJECT_DIR/gradlew
- $CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -q printVersionName --console=plain
- export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -p $CI_PROJECT_DIR -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