Merge pull request #11 from rapid7/PD-45855

PD-45855: Fixes for building releases with github actions
rapid7 · Nov 7, 2024 · d6f7879 · d6f7879
2 parents 9f09deb + 7a074ac
commit d6f7879
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,9 +13,15 @@ jobs:
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
+          gpg-passphrase: GPG_PASSPHRASE
+          gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
+      - name: Configure Git User
+        run: |
+          git config user.email "actions@github.com"
+          git config user.name "GitHub Actions"
       - name: Publish release
         run: mvn -Dresume=false -Prelease -B -V -U release:prepare release:perform
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -15,6 +15,8 @@ jobs:
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
+          gpg-passphrase: GPG_PASSPHRASE
+          gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
       - name: Publish snapshot
         run: mvn deploy -B -C -U -Dprod -Pstyle-enforcer
         env:

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.rapid7.communityid</groupId>
     <artifactId>community-id-java</artifactId>
-    <version>2.0.2-SNAPSHOT</version>
+    <version>2.0.3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>community-id-java</name>
@@ -23,8 +23,8 @@
     </licenses>
 
     <scm>
-        <connection>scm:git:git@github.com:rapid7/community-id-java.git</connection>
-        <developerConnection>scm:git:git@github.com:rapid7/community-id-java.git</developerConnection>
+        <connection>scm:git:https://github.com/rapid7/community-id-java.git</connection>
+        <developerConnection>scm:git:https://github.com/rapid7/community-id-java.git</developerConnection>
         <url>https://github.com/rapid7/community-id-java</url>
         <tag>HEAD</tag>
     </scm>
@@ -147,7 +147,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
+                        <version>1.6</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>
@@ -157,6 +157,13 @@
                                 </goals>
                             </execution>
                         </executions>
+                        <configuration>
+                            <!-- Prevent gpg from using pinentry programs -->
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </plugin>
 
                     <plugin>