Merge branch 'master' into 0.19.x

scala · Sep 20, 2019 · a6c2ecb · a6c2ecb
2 parents 6f10d32 + 187bd85
commit a6c2ecb
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/project/scripts/sbtPublish b/project/scripts/sbtPublish
@@ -18,10 +18,15 @@ if [ ! "$NIGHTLYBUILD" = "yes" ] && [ ! "$RELEASEBUILD" = "yes" ]; then
     exit 1
 fi
 
-# Setup gpg
-export GPG_TTY="$(tty)"
-echo "$PGP_SECRET" | gpg --batch --import
+# Setup gpg (disabled, we use bouncycastle instead)
+# export GPG_TTY="$(tty)"
+# echo "$PGP_SECRET" | gpg --batch --import
+
+# Setup bouncycastle instead of gpg to do signing, because gpg explodes when
+# doing too many signing requests in parallel (https://github.com/sbt/sbt-pgp/issues/168)
+mkdir -p "$HOME/.sbt/gpg"
+echo "$PGP_SECRET" > "$HOME/.sbt/gpg/secring.asc"
 
 # run sbt with the supplied arg
 SBT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/sbt"
-"$SBT" "$RELEASE_CMD"
+"$SBT" -DSBT_PGP_USE_GPG=false "$RELEASE_CMD"