build: Improve publishing workflow

Signed-off-by: Thomas Vitale <[email protected]>
arconia-io · Jan 28, 2024 · cc76d92 · cc76d92
1 parent 451a9db
commit cc76d92
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 17 deletions.
diff --git a/.github/workflows/commit-stage.yml b/.github/workflows/commit-stage.yml
@@ -32,7 +32,11 @@ jobs:
 
  - name: Publish snapshot artifacts
  if: ${{ github.ref == 'refs/heads/main' }}
- run: ./gradlew snapshot
+ run: |
+ VERSION=$(./gradlew properties | grep 'version:' | awk '{print $2}')
+ if [[ $VERSION == *"SNAPSHOT"* ]]; then
+ ./gradlew publishAllPublicationsToSonatypeSnapshotRepository
+ fi
  env:
  MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
  MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}

diff --git a/.github/workflows/release-stage.yml b/.github/workflows/release-stage.yml
@@ -3,8 +3,9 @@ on:
  - workflow_dispatch
 
 jobs:
- build:
- name: Build
+ release:
+ name: Release
+ if: ${{ github.ref == 'refs/heads/main' }}
  runs-on: ubuntu-22.04
  permissions:
  contents: read
@@ -26,7 +27,7 @@ jobs:
  run: ./gradlew build
 
  - name: Publish staging artifacts
- run: ./gradlew release
+ run: ./gradlew publishAllPublicationsToSonatypeStagingRepository
  env:
  MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
  MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}

diff --git a/buildSrc/src/main/groovy/release-conventions.gradle b/buildSrc/src/main/groovy/release-conventions.gradle
@@ -15,8 +15,6 @@ javadoc {
  options.addStringOption("Xdoclint:none", "-quiet")
 }
 
-ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
-
 publishing {
  publications {
  mavenJava(MavenPublication) {
@@ -83,19 +81,9 @@ publishing {
 }
 
 signing {
- required { gradle.taskGraph.hasTask("release") }
+ required { gradle.taskGraph.hasTask("publishAllPublicationsToSonatypeStagingRepository") }
  def signingSecretKey = findProperty('signingSecretKey') ?: System.getenv("SIGNING_SECRET_KEY")
  def signingPassphrase = findProperty('signingPassphrase') ?: System.getenv("SIGNING_PASSPHRASE")
  useInMemoryPgpKeys(signingSecretKey, signingPassphrase)
  sign publishing.publications.mavenJava
 }
-
-tasks.register('snapshot') {
- onlyIf { !isReleaseVersion }
- finalizedBy 'publishAllPublicationsToSonatypeSnapshotRepository'
-}
-
-tasks.register('release') {
- onlyIf { isReleaseVersion }
- finalizedBy 'publishAllPublicationsToSonatypeStagingRepository'
-}