From 76c15caa259c364991c24a97c79a336c0d2f9709 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 8 Jun 2019 22:11:15 +0200 Subject: Revert "temporarly disabled fdroid nightly builds" This reverts commit 033c28e9b9fc87e6ab7d2afb74b449acf25ec25f. --- .circleci/config.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to '.circleci') diff --git a/.circleci/config.yml b/.circleci/config.yml index 99446c24e..4543b5a41 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,17 +27,16 @@ jobs: key: android - run: export GRADLE_USER_HOME=$PWD/.gradle - run: echo y | sdkmanager "platforms;android-$(sed -n 's,.*compileSdkVersion\s*\([0-9][0-9]*\).*,\1,p' build.gradle)" > /dev/null - #* temporarly disabled fdroid nightly builds # workaround for fdroid nightly circleci bug - #*- run: sed -i "s/os.getenv('CIRCLE_REPOSITORY_URL')/\"https:\/\/github.com\/genofire\/Pix-Art-Messenger\"/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py + - run: sed -i "s/os.getenv('CIRCLE_REPOSITORY_URL')/\"https:\/\/github.com\/genofire\/Pix-Art-Messenger\"/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py # generate version number - #*- run: sed -i "s/^\(\s*versionCode\s*\).*$/\1$(git rev-list --first-parent --count HEAD)/" build.gradle - #*- run: sed -i "0,/versionName/s/^\(\s*versionName\).*/\1 \"$(printf '%s-%05d' $(git describe --tag --abbrev=0) $(git rev-list --first-parent --count HEAD))\"/" build.gradle - #*- run: cat -n build.gradle + - run: sed -i "s/^\(\s*versionCode\s*\).*$/\1$(git rev-list --first-parent --count HEAD)/" build.gradle + - run: sed -i "0,/versionName/s/^\(\s*versionName\).*/\1 \"$(printf '%s-%05d' $(git describe --tag --abbrev=0) $(git rev-list --first-parent --count HEAD))\"/" build.gradle + - run: cat -n build.gradle # build - run: ./gradlew assembleStandard # publish on nightly fdroid repo - #*- run: fdroid nightly + - run: fdroid nightly - save_cache: paths: - ~/.android -- cgit v1.2.3