From 9a7c7fc4f47d68102382d806a4b77caf2f3251fd Mon Sep 17 00:00:00 2001 From: leo james Date: Mon, 13 Nov 2023 15:16:31 +0800 Subject: [PATCH 1/2] fix packaging for both jdk 17 and jdk8 (#773) * set declared=true for ark plugin * add export for web plugin * update version to 2.2.4-SNAPSHOT * update gpg version * fix gpg * try to fix gpg error * format test action * fix release * fix release * add snapshot release action * no repository modify * fix jdk17 and jdk8 packaging --------- Co-authored-by: youji.zzl --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 69e14abb6..63a5478b0 100644 --- a/pom.xml +++ b/pom.xml @@ -232,6 +232,9 @@ release + + ${sofa.ark.version.default} + @@ -277,6 +280,9 @@ snapshot + + ${sofa.ark.version.default} + From dab06bb2745e9ce14b8c24843715edd8c7466b33 Mon Sep 17 00:00:00 2001 From: leo james Date: Mon, 13 Nov 2023 15:31:16 +0800 Subject: [PATCH 2/2] add release for jdk17 and jdk8 (#774) * set declared=true for ark plugin * add export for web plugin * update version to 2.2.4-SNAPSHOT * update gpg version * fix gpg * try to fix gpg error * format test action * fix release * fix release * add snapshot release action * no repository modify * fix jdk17 and jdk8 packaging * add release for jdk 17 and jdk8 --------- Co-authored-by: youji.zzl --- .github/workflows/release.yml | 24 +++++++++++++++++++++++- .github/workflows/snapshot.yml | 25 ++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bb583fe30..7fe9489c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: # cache: maven # - name: Build with Maven # run: mvn clean install -DskipTests -B -U -e && sh ./check_format.sh - release: + release_for_jdk8: # needs: build runs-on: ubuntu-latest steps: @@ -38,6 +38,28 @@ jobs: server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + - name: Build with Maven + run: mvn --batch-mode deploy -DskipTests -Prelease + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + release_for_jdk17: + # needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Build with Maven run: mvn --batch-mode deploy -DskipTests -Prelease env: diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 2611bd952..134d64e37 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -22,7 +22,7 @@ jobs: # cache: maven # - name: Build with Maven # run: mvn clean install -DskipTests -B -U -e && sh ./check_format.sh - release: + release_for_jdk8: # needs: build runs-on: ubuntu-latest steps: @@ -38,6 +38,29 @@ jobs: server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + - name: Build with Maven + run: mvn --batch-mode deploy -DskipTests -Psnapshot + env: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + + release_for_jdk17: + # needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + cache: maven + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Build with Maven run: mvn --batch-mode deploy -DskipTests -Psnapshot env: