Maybe fix gpg config?

cljsjs · Mar 28, 2018 · c75654b · c75654b
1 parent 35ece75
commit c75654b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/circle.yml b/circle.yml
@@ -25,6 +25,5 @@ jobs:
             - ~/cljsjs/closure-compiler.jar
     environment:
       BOOT_JVM_OPTIONS: "-Xms512m -Xmx1024m"
-      BOOT_GPG_COMMAND: "gpg --batch --yes"
       NPM_CONFIG_LOGLEVEL: warn
       NPM_CONFIG_UNSAFE_PERMS: true
diff --git a/setup_gpg.sh b/setup_gpg.sh
@@ -6,9 +6,9 @@ set -e
 if [[ $CIRCLE_BRANCH == "master" ]]; then
     mkdir -p ~/.gnupg
     chmod 700 ~/.gnupg
-    echo -e "default-key cljsjs.robot@gmail.com\npassphrase $GPG_PASSPHRASE" >> ~/.gnupg/gpg.conf
+    echo -e "batch\nyes\ndefault-key cljsjs.robot@gmail.com\npassphrase $GPG_PASSPHRASE" >> ~/.gnupg/gpg.conf
     # CircleCI doesn't support newlines in vars so newlines are coded as "|"
     echo -e "$GPG_KEY" | tr "|" "\n" > gpg.key
-    gpg --batch --yes --allow-secret-key-import --import gpg.key
+    gpg --allow-secret-key-import --import gpg.key
     rm gpg.key
 fi