Gradle fix #978

Merged
akinwale merged 6 commits from gradle-fix into master 2020-08-19 19:09:37 +02:00
Showing only changes of commit b26214194e - Show all commits

View file

@ -11,6 +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
- $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:
@ -38,6 +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
- $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
@ -57,6 +59,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
- $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