From 5eb92167c3f825b5d12595a9ec9c38bff53e70a4 Mon Sep 17 00:00:00 2001 From: Kevin Wooten Date: Tue, 6 Dec 2022 15:04:23 -0700 Subject: [PATCH 1/2] Move GitHub release to explicit step in release workflow --- .github/workflows/publish-release.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 44b18763..7f44e9ef 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -32,7 +32,7 @@ jobs: properties: | releaseVersion=${{ github.ref_name }} - - name: Publish Release + - name: Publish Maven Release uses: burrunan/gradle-cache-action@v1 env: ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} @@ -40,12 +40,11 @@ jobs: ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} with: job-id: jdk11-build-test - arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository githubRelease -x test + arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository -x test properties: | releaseVersion=${{ github.ref_name }} sonatypeUsername=${{ secrets.OSSRH_USER }} sonatypePassword=${{ secrets.OSSRH_PASS }} - github.token=${{ secrets.GITHUB_TOKEN }} - name: Publish Documentation uses: JamesIves/github-pages-deploy-action@v4 @@ -53,3 +52,16 @@ jobs: branch: gh-pages clean: false folder: build/dokka + + - name: Publish GitHub Release + uses: burrunan/gradle-cache-action@v1 + env: + ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.OSSRH_GPG_SECRET_KEY_ID }} + ORG_GRADLE_PROJECT_signingKey: ${{ secrets.OSSRH_GPG_SECRET_KEY }} + ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} + with: + job-id: jdk11-build-test + arguments: githubRelease -x test + properties: | + releaseVersion=${{ github.ref_name }} + github.token=${{ secrets.GITHUB_TOKEN }} From a3cd01ac1d23b2f026c87d3e45ceebb095acc90e Mon Sep 17 00:00:00 2001 From: Kevin Wooten Date: Tue, 6 Dec 2022 15:05:10 -0700 Subject: [PATCH 2/2] Fix maven badges in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 07c5aea3..5681f834 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ Sunday 🙏 The framework of REST for Kotlin ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/outfoxx/sunday-kt/CI) ![Coverage](https://sonarcloud.io/api/project_badges/measure?project=outfoxx_sunday-kt&metric=coverage) -![Maven Central](https://img.shields.io/maven-central/v/io.outfoxx.sunday/sunday.svg) -![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/io.outfoxx.sunday/sunday.svg) +![Maven Central](https://img.shields.io/maven-central/v/io.outfoxx.sunday/sunday-core.svg) +![Sonatype Nexus (Snapshots)](https://img.shields.io/nexus/s/https/oss.sonatype.org/io.outfoxx.sunday/sunday-core.svg) Kotlin framework for generated REST clients.