Move attempted decryption of publishing keys down into ciBuild.sh

micrometer-metrics · Jul 25, 2017 · 2e12586 · 2e12586
1 parent 29424a0
commit 2e12586
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/circle.yml b/circle.yml
@@ -2,8 +2,6 @@ machine:
   java:
     version: oraclejdk8
 test:
-  pre:
-    - openssl aes-256-cbc -d -in gradle.properties.enc -out gradle.properties -k $KEY
   override:
     - ./gradle/ciBuild.sh
   post:

diff --git a/gradle/ciBuild.sh b/gradle/ciBuild.sh
@@ -8,9 +8,11 @@ if [ $CIRCLE_PR_NUMBER ]; then
   ./gradlew clean build $SWITCHES
 elif [ -z $CIRCLE_TAG ]; then
   echo -e ?'Build Branch with Snapshot => Branch ['$CIRCLE_BRANCH']'
+  openssl aes-256-cbc -d -in gradle.properties.enc -out gradle.properties -k $KEY
   ./gradlew clean build $SWITCHES
 elif [ $CIRCLE_TAG ]; then
   echo -e 'Build Branch for Release => Branch ['$CIRCLE_BRANCH']  Tag ['$CIRCLE_TAG']'
+  openssl aes-256-cbc -d -in gradle.properties.enc -out gradle.properties -k $KEY
   case "$CIRCLE_TAG" in
   *-rc\.*)
     ./gradlew -Prelease.disableGitChecks=true -Prelease.useLastTag=true clean build candidate $SWITCHES