From 726d6b7bd66819058ce6b52d08de8e42e88a47f8 Mon Sep 17 00:00:00 2001 From: konifar Date: Mon, 5 Feb 2018 22:53:25 +0900 Subject: [PATCH 1/2] Modified ci setting --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 622948a5..eb1d6393 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,19 +38,19 @@ jobs: - run: name: decrypt keystore command: | - if [ $CIRCLE_BRANCH = 'master' ]; then + if [ $CIRCLE_BRANCH = 'master' -o $CIRCLE_BRANCH = 'release' ]; then openssl aes-256-cbc -k $KEYSTORE_DECRYPT_PASSWORD -d -in encrypted-droidkaigi-key -out release.keystore fi - run: name: decrypt json command: | - if [ $CIRCLE_BRANCH = 'master' ]; then + if [ $CIRCLE_BRANCH = 'master' -o $CIRCLE_BRANCH = 'release' ]; then openssl aes-256-cbc -k $JSON_DECRYPT_PASSWORD -d -in encrypted-google-services.json -out app/google-services.json fi - run: name: Test command: | - if [ $CIRCLE_BRANCH = 'master' ]; then + if [ $CIRCLE_BRANCH = 'master' -o $CIRCLE_BRANCH = 'release' ]; then ./gradlew --stacktrace testRelease else ./gradlew --stacktrace test${APP_BUILD_TYPE^} @@ -58,7 +58,7 @@ jobs: - run: name: Build command: | - if [ $CIRCLE_BRANCH = 'master' ]; then + if [ $CIRCLE_BRANCH = 'master' -o $CIRCLE_BRANCH = 'release' ]; then ./gradlew --offline --stacktrace assembleRelease else ./gradlew --offline --stacktrace assemble${APP_BUILD_TYPE^} @@ -66,7 +66,7 @@ jobs: - run: name: Check command: | - if [ ! $CIRCLE_BRANCH = 'master' ]; then + if [ ! $CIRCLE_BRANCH = 'master' -a ! $CIRCLE_BRANCH = 'release' ]; then ./gradlew --stacktrace lint${APP_BUILD_TYPE^} ./gradlew --stacktrace ktlint${APP_BUILD_TYPE^}Check bundle exec danger @@ -78,7 +78,7 @@ jobs: ./gradlew :app:uploadDeployGateRelease elif [[ "${CIRCLE_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "Deploy to Google Play" - ./gradlew clean assembleRelease publishApkRelease +# ./gradlew clean assembleRelease publishApkRelease fi - store_artifacts: path: app/build/reports From 7728ef6ec3f9d5991926f3653ad32a42f323eb5f Mon Sep 17 00:00:00 2001 From: konifar Date: Mon, 5 Feb 2018 22:54:40 +0900 Subject: [PATCH 2/2] FIxed error --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb1d6393..4905e8fa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,7 +78,6 @@ jobs: ./gradlew :app:uploadDeployGateRelease elif [[ "${CIRCLE_TAG}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then echo "Deploy to Google Play" -# ./gradlew clean assembleRelease publishApkRelease fi - store_artifacts: path: app/build/reports