Killing "release" step in favor of "publish"; reading GPG_PASSPHRASE …

…from environment.
smartystreets · Feb 1, 2023 · f9d1806 · f9d1806
1 parent f559496
commit f9d1806
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 53 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -22,9 +22,9 @@ jobs:
           gpg-passphrase: GPG_PASSPHRASE
       - run : |
           echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}" | gpg --batch --import
-          VERSION="${GITHUB_REF#refs/*/}" make release
+          VERSION="${GITHUB_REF#refs/*/}" make publish
         env:
             GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
             GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSPHRASE }}
             OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-            OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+            OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
diff --git a/Dockerfile b/Dockerfile
diff --git a/Makefile b/Makefile
@@ -21,20 +21,7 @@ publish: compile
 	  && mvn \
 	    --batch-mode \
 	    --no-transfer-progress \
-	    -Dgpg.passphrase=${{ secrets.OSSRH_GPG_SECRET_KEY_PASSPHRASE }} \
+	    -Dgpg.passphrase=${GPG_PASSPHRASE} \
 	    deploy
-# gpg_tty needs to know the tty device -- GPG_TTY="$(shell tty)"
-##########################################################
-
-workspace:
-	docker-compose run sdk /bin/sh
-
-release: publish
-			hub release create -m "v${VERSION} Release" "${VERSION}" \
-			-a target/smartystreets-java-sdk-${VERSION}-jar-with-dependencies.jar \
-			-a target/smartystreets-java-sdk-${VERSION}-javadoc.jar \
-			-a target/smartystreets-java-sdk-${VERSION}.jar
-
-.PHONY: clean test integration-test compile publish workspace release
-
 
+.PHONY: clean test integration-test compile publish
diff --git a/docker-compose.yml b/docker-compose.yml