From 8b84a41edf0bd7c6ce7eddb8df8f167349dbf4c4 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Mon, 26 Feb 2024 15:20:20 +0100 Subject: [PATCH 1/5] try sign --- .github/workflows/development.yml | 12 +++++++++++- .github/workflows/master.yml | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index c95e94f..b26cfd6 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -28,11 +28,14 @@ jobs: # Setup JDK and Maven - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'zulu' cache: maven + gpg-private-key: ${{ secrets.GPG_SECRET_KEYS }} + gpg-passphrase: GPG_PASSPHRASE + # Prepare - name: Prepare Maven Wrapper @@ -46,6 +49,13 @@ jobs: - name: Run itest run: ./mvnw integration-test failsafe:verify -Pitest -ntp -U -B -T4 + # Create a release + - name: Sign with Maven + run: ./mvnw -B -ntp -Prelease + env: + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + + # - name: Upload coverage to Codecov # if: github.event_name == 'push' && github.actor != 'dependabot[bot]' # uses: codecov/codecov-action@v1.0.2 diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 977ee7a..6c70882 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -15,12 +15,12 @@ jobs: # Setup JDK and .m2/settings.xml - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 - server-id: ossrh distribution: 'zulu' cache: maven + server-id: ossrh server-username: OSS_CENTRAL_USERNAME # env variable for Maven Central server-password: OSS_CENTRAL_PASSWORD # env variable for Maven Central From e5936e6f32186b20d0de88f0d6aaeac49b7e82b3 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Mon, 26 Feb 2024 15:23:09 +0100 Subject: [PATCH 2/5] correct phase --- .github/workflows/development.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index b26cfd6..d55dd02 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -46,12 +46,12 @@ jobs: run: ./mvnw clean verify -U -B -ntp -T4 # itest - - name: Run itest - run: ./mvnw integration-test failsafe:verify -Pitest -ntp -U -B -T4 + # - name: Run itest + # run: ./mvnw integration-test failsafe:verify -Pitest -ntp -U -B -T4 # Create a release - name: Sign with Maven - run: ./mvnw -B -ntp -Prelease + run: ./mvnw -B -ntp -Prelease -DskipTests verify env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} From e9b489a038859244f8f6f8c00888806df4bd1aca Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Mon, 26 Feb 2024 15:26:03 +0100 Subject: [PATCH 3/5] specify key name --- .github/workflows/development.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index d55dd02..fa8a86c 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -51,7 +51,7 @@ jobs: # Create a release - name: Sign with Maven - run: ./mvnw -B -ntp -Prelease -DskipTests verify + run: ./mvnw -B -ntp -Prelease -DskipTests verify -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" env: GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} From 1144d9ba8a0ed1f151c02cd3fea3aa5694a31cf6 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Mon, 26 Feb 2024 15:34:15 +0100 Subject: [PATCH 4/5] list keys --- .github/workflows/development.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index fa8a86c..6d91345 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -34,8 +34,14 @@ jobs: distribution: 'zulu' cache: maven gpg-private-key: ${{ secrets.GPG_SECRET_KEYS }} - gpg-passphrase: GPG_PASSPHRASE + gpg-passphrase: MAVEN_GPG_PASSPHRASE + - name: List keys + run: | + echo "GPG2" + gpg2 --list-secret + echo "GPG" + gpg --list-secret # Prepare - name: Prepare Maven Wrapper From d664018084625903834134a42ab085f8f3b83264 Mon Sep 17 00:00:00 2001 From: Simon Zambrovski Date: Mon, 26 Feb 2024 15:45:36 +0100 Subject: [PATCH 5/5] update versions --- .github/workflows/development.yml | 21 +++------------------ .github/workflows/master.yml | 2 +- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/.github/workflows/development.yml b/.github/workflows/development.yml index 6d91345..164b801 100644 --- a/.github/workflows/development.yml +++ b/.github/workflows/development.yml @@ -21,7 +21,7 @@ jobs: steps: # Checkout the code - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Expose branch name run: echo ${{ github.ref }} @@ -33,15 +33,6 @@ jobs: java-version: 17 distribution: 'zulu' cache: maven - gpg-private-key: ${{ secrets.GPG_SECRET_KEYS }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - - - name: List keys - run: | - echo "GPG2" - gpg2 --list-secret - echo "GPG" - gpg --list-secret # Prepare - name: Prepare Maven Wrapper @@ -52,14 +43,8 @@ jobs: run: ./mvnw clean verify -U -B -ntp -T4 # itest - # - name: Run itest - # run: ./mvnw integration-test failsafe:verify -Pitest -ntp -U -B -T4 - - # Create a release - - name: Sign with Maven - run: ./mvnw -B -ntp -Prelease -DskipTests verify -Dgpg.keyname="${{ secrets.GPG_KEYNAME }}" - env: - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + - name: Run itest + run: ./mvnw integration-test failsafe:verify -Pitest -ntp -U -B -T4 # - name: Upload coverage to Codecov diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6c70882..8b27884 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -11,7 +11,7 @@ jobs: name: Build and run tests steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Setup JDK and .m2/settings.xml - name: Set up JDK