Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into develop #21

Merged
merged 7 commits into from
Aug 18, 2023
Merged

Merge master into develop #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3bf3b22
Merge pull request #16 from swisspost/develop
MonsieurBon Jun 2, 2023
13c8e67
Merge pull request #18 from swisspost/develop
MonsieurBon Jun 2, 2023
07a1ae0
fix release fails with Unable to decrypt gpg passphrase
Jun 7, 2023
f688ff9
Merge branch 'swisspost:master' into release_fails_with_Unable_to_dec…
gedestroy Jun 7, 2023
4d6502b
Merge pull request #19 from gedestroy/release_fails_with_Unable_to_de…
dominik-cnx Jun 8, 2023
f32fe45
[maven-release-plugin] prepare release apikana-0.4.22
swisspost-bot Jun 8, 2023
492674c
[maven-release-plugin] prepare for next development iteration
swisspost-bot Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,19 @@ jobs:
uses: joschi/setup-jdk@v2
with:
java-version: '8'
server-id: sonatype-nexus-staging # Value of the distributionManagement/repository/id field of the pom.xml
server-username: CI_DEPLOY_USERNAME # env variable for username in deploy
server-password: CI_DEPLOY_PASSWORD # env variable for token in deploy
gpg-private-key: ${{ secrets.CI_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
gpg-passphrase: CI_GPG_PASSPHRASE # env variable for GPG private key passphrase

- name: Release
if: ${{ !contains(github.event.head_commit.message, '[maven-release-plugin]') }}
run: |
echo "Preparing release ${RELEASE_VERSION}..."
mvn --settings settings.xml -B release:prepare -Pdo-release -DreleaseVersion=${RELEASE_VERSION} -DdevelopmentVersion=${DEVELOP_VERSION}
mvn --settings settings.xml release:perform -Pdo-release
mvn -B release:prepare -Pdo-release -DreleaseVersion=${RELEASE_VERSION} -DdevelopmentVersion=${DEVELOP_VERSION}
mvn release:perform -Pdo-release
env:
CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
CI_GPG_PASSPHRASE: ${{ secrets.CI_GPG_PASSPHRASE }}
2 changes: 1 addition & 1 deletion apikana-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.swisspush.apikana</groupId>
<artifactId>apikana</artifactId>
<version>0.4.22-SNAPSHOT</version>
<version>0.4.23-SNAPSHOT</version>
</parent>

<groupId>org.swisspush.maven.plugins</groupId>
Expand Down
2 changes: 1 addition & 1 deletion apikana-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.swisspush.apikana</groupId>
<artifactId>apikana</artifactId>
<version>0.4.22-SNAPSHOT</version>
<version>0.4.23-SNAPSHOT</version>
</parent>

<artifactId>apikana-parent</artifactId>
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.swisspush.apikana</groupId>
<artifactId>apikana</artifactId>
<version>0.4.22-SNAPSHOT</version>
<version>0.4.23-SNAPSHOT</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -209,6 +209,11 @@
<configuration>
<homedir>${session.executionRootDirectory}</homedir>
<keyname>230584D7</keyname>
<!-- Prevent gpg from using pinentry programs -->
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>
</execution>
</executions>
Expand Down
Loading