Merge branch 'release-10.0.0' into dev

bonitasoft · Mar 13, 2024 · 4be40b6 · 4be40b6
2 parents aa181c9 + 32eb4aa
commit 4be40b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/_reusable_build.yml b/.github/workflows/_reusable_build.yml
@@ -24,6 +24,8 @@ on:
         required: true
       GPG_KEYNAME:
         required: true
+      GPG_PASSPHRASE:
+        required: true
 
 jobs:
   build:
@@ -66,9 +68,12 @@ jobs:
       - name: Publish ${{ steps.version.outputs.version }} to Artifactory
         if: ${{ inputs.publishToArtifactory }}
         env:
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           ALT_DEPLOYMENT_REPOSITORY: ${{ endsWith(steps.version.outputs.version,'-SNAPSHOT') && format('snapshots::{0}', vars.SNAPSHOTS_REPOSITORY_URL) || format('staging::{0}', vars.STAGING_REPOSITORY_URL) }}
         run: ./mvnw --no-transfer-progress -B deploy -Dgpg.keyname=${{ secrets.GPG_KEYNAME }} -Prelease -DaltDeploymentRepository=${{env.ALT_DEPLOYMENT_REPOSITORY}}
       - name: Publish ${{ steps.version.outputs.version }} to Central
         # Never publish a Weekly build to Maven Central
         if: ${{ inputs.publishToCentral && !contains(steps.version.outputs.version,'W')}}
+        env:
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         run: ./mvnw --no-transfer-progress -B deploy -Dgpg.keyname=${{ secrets.GPG_KEYNAME }} -Possrh
diff --git a/pom.xml b/pom.xml
@@ -234,13 +234,6 @@
                   <goal>sign</goal>
                 </goals>
                 <phase>verify</phase>
-                <configuration>
-                  <!-- Prevent `gpg` from using pinentry programs -->
-                  <gpgArguments>
-                    <arg>--pinentry-mode</arg>
-                    <arg>loopback</arg>
-                  </gpgArguments>
-                </configuration>
               </execution>
             </executions>
           </plugin>