From ddd2932249acd476fc5e38022e4ded70dfb6728f Mon Sep 17 00:00:00 2001 From: ebocher Date: Fri, 8 Nov 2024 15:12:37 +0100 Subject: [PATCH] Fix deploy --- .github/workflows/CI release.yml | 22 +++++++++++++--------- .github/workflows/CI snapshot.yml | 17 +++++++++++++---- docs/CHANGELOG.md | 2 ++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI release.yml b/.github/workflows/CI release.yml index ad710ad..7517240 100644 --- a/.github/workflows/CI release.yml +++ b/.github/workflows/CI release.yml @@ -16,6 +16,15 @@ jobs: - name: Checkout uses: actions/checkout@v2 + # Install the GPG secret key + - name: Import GPG Key + run: | + echo "${{ secrets.GPG_PUBLIC_KEY }}" | gpg --import + echo "${{ secrets.GPG_SECRET_KEY }}" | gpg --import --no-tty --batch --yes + env: + GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} + # Setup the jdk using version 11 of Adoptium Temurin - name: Setup java 11 using Adoptium Temurin uses: actions/setup-java@v2 @@ -25,7 +34,7 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-private-key: ${{ secrets.GPG_SECRET_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE # Configure git user in order to sign release with OrbisGIS user. @@ -34,11 +43,6 @@ jobs: git config user.email "info@orbisgis.org" git config user.name OrbisGIS - #Install the GPG secret key - - name: Install gpg secret key - run: | - cat <(echo -e "${{ secrets.OSSRH_GPG_SECRET_KEY }}") | gpg --batch --import - gpg --list-secret-keys --keyid-format LONG # Test build - name: Build test @@ -60,9 +64,9 @@ jobs: release:prepare release:perform \ -Dusername=$GITHUB_ACTOR -Dpassword=$GITHUB_TOKEN ${VERSION:+"-DdevelopmentVersion="$VERSION"-SNAPSHOT"} env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MVN_CENTRAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} # Export the last git tag into env. - name: Export env values diff --git a/.github/workflows/CI snapshot.yml b/.github/workflows/CI snapshot.yml index 45209d6..b11ba40 100644 --- a/.github/workflows/CI snapshot.yml +++ b/.github/workflows/CI snapshot.yml @@ -19,6 +19,15 @@ jobs: - name: Checkout uses: actions/checkout@v2 + # Install the GPG secret key + - name: Import GPG Key + run: | + echo "${{ secrets.GPG_PUBLIC_KEY }}" | gpg --import + echo "${{ secrets.GPG_SECRET_KEY }}" | gpg --import --no-tty --batch --yes + env: + GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }} + GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }} + # Setup the jdk using version 11 of Adoptium Temurin - name: Setup java 11 using Adoptium Temurin uses: actions/setup-java@v2 @@ -28,7 +37,7 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} + gpg-private-key: ${{ secrets.GPG_SECRET_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE # Install the GPG secret key @@ -41,6 +50,6 @@ jobs: - name: Deploy run: mvn deploy -ntp --batch-mode env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_PASSWORD }} + MAVEN_USERNAME: ${{ secrets.MVN_CENTRAL_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MVN_CENTRAL_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 22eefcd..6a1ed91 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1 +1,3 @@ ## Changelog for v0.7.1 + +- Fix github actions