diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06be2c99..4a310d8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,8 +17,8 @@ build apk: - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1) artifacts: paths: - - $CI_PROJECT_DIR/bin/browser-*-release__arm.apk - - $CI_PROJECT_DIR/bin/browser-*-release__arm64.apk + - bin/browser-*-release__arm.apk + - bin/browser-*-release__arm64.apk expire_in: 1 week script: - export PATH=/usr/bin:$PATH @@ -41,8 +41,9 @@ build apk: - chmod u+x ./release.sh - ./release.sh - mkdir -p $CI_PROJECT_DIR/bin/ && cp bin/*.apk $CI_PROJECT_DIR/bin/ - - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release__arm.apk /dev/null - - cp $CI_PROJECT_DIR/bin/browser-$BUILD_VERSION-release__arm64.apk /dev/null + - cd $CI_PROJECT_DIR + - cp bin/browser-$BUILD_VERSION-release__arm.apk /dev/null + - cp bin/browser-$BUILD_VERSION-release__arm64.apk /dev/null deploy build.lbry.io: image: python:latest @@ -50,9 +51,10 @@ deploy build.lbry.io: dependencies: - build apk before_script: - - chmod u+x $CI_PROJECT_DIR/gradlew - pip install awscli + - chmod u+x $CI_PROJECT_DIR/gradlew - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1) + - echo "BuildVersion=$BUILD_VERSION" - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk script: @@ -68,8 +70,8 @@ release apk: dependencies: - build apk before_script: - - chmod u+x $CI_PROJECT_DIR/gradlew - pip install awscli githubrelease + - chmod u+x $CI_PROJECT_DIR/gradlew - export BUILD_VERSION=$($CI_PROJECT_DIR/gradlew -q printVersionName --console=plain | tail -1) - export BUILD_APK_FILENAME__32=browser-$BUILD_VERSION-release__arm.apk - export BUILD_APK_FILENAME__64=browser-$BUILD_VERSION-release__arm64.apk