Skip to content

Commit ee808d5

Browse files
GH-257 reverting the gpg signing process (to use the key import)
reverting #261
1 parent fd8df58 commit ee808d5

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.github/workflows/maven-snapshot.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@ jobs:
1414
- name: Checkout code
1515
uses: actions/checkout@v6
1616

17+
- name: Import GPG key
18+
env:
19+
GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
20+
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
21+
run: |
22+
echo $GPG_SECRET_KEYS | base64 --decode | gpg --import --no-tty --batch --yes
23+
echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust --no-tty --batch --yes
24+
1725
- name: Setup JDK
1826
uses: actions/setup-java@v5
1927
with:
@@ -23,28 +31,27 @@ jobs:
2331
server-id: central
2432
server-username: MAVEN_USERNAME
2533
server-password: MAVEN_CENTRAL_TOKEN
34+
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
35+
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2636

2737
- name: AEM6.5 Build
28-
run: mvn clean deploy -DskipTests -Paem65deps,aem65,release -Dgpg.signer=bc
38+
run: mvn clean deploy -DskipTests -Paem65deps,aem65,release
2939
env:
3040
MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
3141
MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
3242
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
33-
MAVEN_GPG_KEY: ${{ secrets.GPG_SECRET_KEYS }}
3443

3544
- name: AEMaaCS Build
36-
run: mvn clean deploy -PaemaacsDeps,aemaacs,release,attach-javadoc,attach-source -Dgpg.signer=bc
45+
run: mvn clean deploy -PaemaacsDeps,aemaacs,release,attach-javadoc,attach-source
3746
env:
3847
MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
3948
MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
4049
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
41-
MAVEN_GPG_KEY: ${{ secrets.GPG_SECRET_KEYS }}
4250

4351
- name: Main Build
44-
run: mvn clean deploy -DskipTests -Prelease -Dgpg.signer=bc
52+
run: mvn clean deploy -DskipTests -Prelease
4553
env:
4654
MAVEN_USERNAME: ${{ secrets.AIO_MAVEN_USER_NAME }}
4755
MAVEN_CENTRAL_TOKEN: ${{ secrets.AIO_MAVEN_TOKEN }}
4856
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
49-
MAVEN_GPG_KEY: ${{ secrets.GPG_SECRET_KEYS }}
5057

pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,13 @@
565565
<plugin>
566566
<groupId>org.apache.maven.plugins</groupId>
567567
<artifactId>maven-gpg-plugin</artifactId>
568+
<!-- Prevent gpg from using pinentry programs -->
569+
<configuration>
570+
<gpgArguments>
571+
<arg>--pinentry-mode</arg>
572+
<arg>loopback</arg>
573+
</gpgArguments>
574+
</configuration>
568575
<executions>
569576
<execution>
570577
<id>sign-artifacts</id>

0 commit comments

Comments
 (0)