Merge branch 'master' into release

# Conflicts: # .circleci/config.yml
DroidKaigi · Feb 5, 2018 · 86f3a9c · 86f3a9c
2 parents e8ff16a + 25570d8
commit 86f3a9c
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,35 +38,35 @@ 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^}
               fi
       - 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^}
               fi
       - 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,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