From 9b87d2881737ab352a1ceafac71fa534da8e0b07 Mon Sep 17 00:00:00 2001 From: Andrea Peruffo Date: Sat, 20 Jan 2024 10:34:52 +0000 Subject: [PATCH] attempt a release --- .github/workflows/release.yaml | 77 +++++++++++++---------- pom.xml | 112 +++++++++++++++++---------------- runtime/pom.xml | 12 +--- test-gen-plugin/pom.xml | 7 +-- wasi/pom.xml | 14 +---- wasm-support-plugin/pom.xml | 7 +-- wasm/pom.xml | 3 +- 7 files changed, 112 insertions(+), 120 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4170a47d3..de0109e99 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,15 +1,17 @@ name: release on: - workflow_dispatch: - inputs: - release-version: - description: 'Version being released' - required: true - branch: - description: 'Branch to release from' - required: true - default: 'main' + push: + # TODO: revert these changes, just need to publish! + # workflow_dispatch: + # inputs: + # release-version: + # description: 'Version being released' + # required: true + # branch: + # description: 'Branch to release from' + # required: true + # default: 'main' permissions: contents: write @@ -23,8 +25,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - # Configure build steps as you'd normally do - - name: Setup Java uses: actions/setup-java@v3 with: @@ -36,36 +36,49 @@ jobs: gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE + - id: install-secret-key + name: Install gpg secret key + run: | + cat <(echo -e "${{ secrets.GPG_PRIVATE_KEY }}") | gpg --batch --import + gpg --list-secret-keys --keyid-format LONG + + - name: Compile + run: mvn clean install -DskipTests=true + - name: Setup Git run: | git config user.name "Chicory BOT" git config user.email "chicory@dylibso.com" - - name: Set the version - run: | - mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.release-version }} - git add . - git commit -m "Release version update ${{ github.event.inputs.release-version }}" - git push - git tag ${{ github.event.inputs.release-version }} - git push origin ${{ github.event.inputs.release-version }} - env: - GITHUB_TOKEN: ${{secrets.GH_TOKEN}} + # - name: Set the version + # run: | + # mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${{ github.event.inputs.release-version }} + # git add . + # git commit -m "Release version update ${{ github.event.inputs.release-version }}" + # git push + # git tag ${{ github.event.inputs.release-version }} + # git push origin ${{ github.event.inputs.release-version }} + # env: + # GITHUB_TOKEN: ${{secrets.GH_TOKEN}} - name: Release to Maven Central - run: | - export GPG_TTY=$(tty) - mvn clean install source:jar javadoc:jar deploy --batch-mode -Prelease -DskipTests -X + run: mvn --batch-mode clean deploy -Prelease -DskipTests=true -X env: MAVEN_USERNAME: ${{ secrets.SONATYPE_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - name: Back to Snapshot - run: | - mvn versions:set -DgenerateBackupPoms=false -DnewVersion=999-SNAPSHOT - git add . - git commit -m "Snapshot version update" - git push - env: - GITHUB_TOKEN: ${{secrets.GH_TOKEN}} + # - name: Release + # uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 + # with: + # tag_name: ${{ github.event.inputs.release-version }} + # token: ${{secrets.GH_TOKEN}} + + # - name: Back to Snapshot + # run: | + # mvn versions:set -DgenerateBackupPoms=false -DnewVersion=999-SNAPSHOT + # git add . + # git commit -m "Snapshot version update" + # git push + # env: + # GITHUB_TOKEN: ${{secrets.GH_TOKEN}} diff --git a/pom.xml b/pom.xml index d7f1760e0..0ac45ab5e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,11 @@ Native JVM WebAssembly runtime https://github.com/dylibso/chicory + + Dylibso, Inc. + https://dylibso.com + + Apache-2.0 @@ -25,9 +30,6 @@ oss@dylibso.com Dylibso, Inc. https://dylibso.com - - Maintainer - @@ -51,6 +53,14 @@ https://github.com/dylibso/chicory/issues + + + ossrh + Central Repository OSSRH + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + UTF-8 UTF-8 @@ -113,7 +123,6 @@ - @@ -204,6 +213,36 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + none + 1.8 + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + attach-sources + + jar + + + + com.diffplug.spotless spotless-maven-plugin @@ -267,20 +306,16 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - true - - ossrh - https://s01.oss.sonatype.org/ - true - - org.apache.maven.plugins maven-gpg-plugin - 3.1.0 + ${maven-gpg-plugin.version} + + + --pinentry-mode + loopback + + sign-artifacts @@ -288,52 +323,19 @@ sign verify - - - - --pinentry-mode - loopback - - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - org.apache.maven.plugins - maven-javadoc-plugin + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true - - - jakarta.annotation - jakarta.annotation-api - ${annotation-api.version} - - - false - false - ${maven.compiler.source} - -Xdoclint:none + ossrh + https://s01.oss.sonatype.org/ + true - - - attach-javadocs - - jar - - - diff --git a/runtime/pom.xml b/runtime/pom.xml index 44dcaa80c..36a683a56 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -6,23 +6,13 @@ com.dylibso.chicory chicory 0.0.3 + ../pom.xml runtime jar Chicory - Runtime Native JVM WebAssembly runtime - https://github.com/dylibso/chicory - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - com.dylibso.chicory diff --git a/test-gen-plugin/pom.xml b/test-gen-plugin/pom.xml index 79a540f2b..95c65c590 100644 --- a/test-gen-plugin/pom.xml +++ b/test-gen-plugin/pom.xml @@ -6,13 +6,12 @@ com.dylibso.chicory chicory 0.0.3 + ../pom.xml test-gen-plugin maven-plugin - - - true - + Chicory - Test Gen Maven Plugin + A Maven Plugin to generate tests from the WebAssembly testsuite diff --git a/wasi/pom.xml b/wasi/pom.xml index d38e7dd0e..c22a8fd22 100644 --- a/wasi/pom.xml +++ b/wasi/pom.xml @@ -6,22 +6,12 @@ com.dylibso.chicory chicory 0.0.3 + ../pom.xml wasi jar Chicory - WASI - WASI Preview 1 - - https://github.com/dylibso/chicory - - - - Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - + WASI Preview 1 impolementation for Chicory diff --git a/wasm-support-plugin/pom.xml b/wasm-support-plugin/pom.xml index e113bde95..ff711a94e 100644 --- a/wasm-support-plugin/pom.xml +++ b/wasm-support-plugin/pom.xml @@ -6,13 +6,12 @@ com.dylibso.chicory chicory 0.0.3 + ../pom.xml wasm-support-plugin maven-plugin - - - true - + Chicory - Wasm Support Maven Plugin + A Maven Plugin to generate a Java class from tsv OpCodes diff --git a/wasm/pom.xml b/wasm/pom.xml index 2419a0e10..124e7a7e0 100644 --- a/wasm/pom.xml +++ b/wasm/pom.xml @@ -6,13 +6,12 @@ com.dylibso.chicory chicory 0.0.3 + ../pom.xml wasm jar - Chicory - WASM WebAssembly tools - https://github.com/dylibso/chicory