try to import the gpg key

smartystreets · Feb 1, 2023 · d7c840f · d7c840f
1 parent bfb35e8
commit d7c840f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,9 +24,11 @@ jobs:
           gpg-private-key: ${{env.GPG_SECRET_KEY}}
           gpg-passphrase: ${{env.GPG_PASSPHRASE}}
       - run : |
-          mkdir -p ~/.m2
-          echo "<settingsSecurity><master>$(mvn --encrypt-master-password "${{env.OSSRH_PASSWORD}}")</master></settingsSecurity>" > ~/.m2/settings-security.xml
-          echo -e "${{env.GPG_SECRET_KEY}}" | gpg --batch --import
+          cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import
+#      - run : |
+#          mkdir -p ~/.m2
+#          echo "<settingsSecurity><master>$(mvn --encrypt-master-password "${{env.OSSRH_PASSWORD}}")</master></settingsSecurity>" > ~/.m2/settings-security.xml
+#          echo -e "${{env.GPG_SECRET_KEY}}" | gpg --batch --import
       - run : | 
           VERSION="${GITHUB_REF#refs/*/}" make release
 

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ publish: compile
 	    --no-transfer-progress \
 	    --errors \
 	    --debug \
-	    -Dgpg.passphrase="${OSSRH_GPG_SECRET_KEY_PASSPHRASE}" \
+	    -Dgpg.passphrase="${{ secrets.OSSRH_GPG_SECRET_KEY_PASSPHRASE }}" \
 	    deploy
 # gpg_tty needs to know the tty device -- GPG_TTY="$(shell tty)"
 ##########################################################