Skip to content

Commit 7487320

Browse files
committed
chore: 🤖 Remove the custom gpg script
Latest sbt-pgp release fixes the original issue and read the passphrase in PGP_PASSPHRASE environment variable now
1 parent 6e2a1e4 commit 7487320

File tree

4 files changed

+3
-7
lines changed

4 files changed

+3
-7
lines changed

‎Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ update-changelog:
3535

3636
.configure-cukebot-in-docker:
3737
[ -f '/home/cukebot/configure' ] && /home/cukebot/configure
38+
# Cucumber team provides the passphrase in this variable
39+
export PGP_PASSPHRASE="$GPG_SIGNING_KEY_PASSPHRASE"
3840
.PHONY: .configure-cukebot-in-docker
3941

4042
.release-in-docker: .configure-cukebot-in-docker default update-changelog update-installdoc .commit-and-push-changelog-and-docs

‎build.sbt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
128128
Global / publishMavenStyle := true
129129
Global / publishTo := sonatypePublishToBundle.value
130130

131-
// https://github.com/sbt/sbt-pgp/issues/173
132-
Global / PgpKeys.gpgCommand := (baseDirectory.value / "gpg.sh").getAbsolutePath
133-
134131
// https://github.com/xerial/sbt-sonatype#using-with-sbt-release-plugin
135132
releaseCrossBuild := true
136133
releaseProcess := Seq[ReleaseStep](

‎gpg.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
1212

1313
// Publishing
1414
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.5")
15-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")
15+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")

0 commit comments

Comments
 (0)