sync workflows

Author: typotter

.github/workflows/publish-sdk.yml

@@ -5,32 +5,39 @@ on:
     types: [published]
 
 env:
-  ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
-  ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
   CI: true
 
 jobs:
   publish:
     runs-on: ubuntu-latest
+    env:
+      JRELEASER_MAVENCENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_TOKEN_USERNAME }}
+      JRELEASER_MAVENCENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN_PASSWORD }}
+      JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      JRELEASER_GPG_PUBLIC_KEY: ${{ secrets.GPG_PUBLIC_KEY }}
+      JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+      JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Set up Maven Central Repository
+      - name: Set up JDK 8
         uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'temurin'
-          server-id: ossrh
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: Download test data
         run: make test-data
 
-      - name: Publish package to Maven Central
-        run: ./gradlew check publish --no-daemon
-        env:
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      - name: Test
+        run: ./gradlew check
+
+      - name: Stage artifacts
+        run: ./gradlew clean publish -Prelease
+
+      - name: Deploy to Maven Central
+        run: ./gradlew jreleaserDeploy

.github/workflows/publish-snapshot.yml

@@ -24,29 +24,20 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Set up JDK 17
+      - name: Set up JDK 8
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'adopt'
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
 
-      - name: Set up JDK 8
-        uses: actions/setup-java@v4
-        with:
-          java-version: '8'
-          distribution: 'temurin'
-
       - name: Download test data
         run: make test-data
 
       - name: Test
         run: ./gradlew check
 
-      - name: Verify JReleaser
-        run: ./gradlew jreleaserConfig
-
       - name: Stage artifacts
         run: ./gradlew clean publish -Psnapshot
 

build.gradle

@@ -11,7 +11,7 @@ java {
 }
 
 group = 'cloud.eppo'
-version = '5.2.1-SNAPSHOT'
+version = '5.2.1'
 ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
 import org.apache.tools.ant.filters.ReplaceTokens
@@ -161,6 +161,29 @@ jreleaser {
   }
 }
 
+
+// Custom task to ensure we can conditionally publish either a release or snapshot artifact
+// based on a command line switch. See github workflow files for more details on usage.
+tasks.register('checkVersion') {
+  doLast {
+    if (!project.hasProperty('release') && !project.hasProperty('snapshot')) {
+      throw new GradleException("You must specify either -Prelease or -Psnapshot")
+    }
+    if (project.hasProperty('release') && project.version.endsWith('SNAPSHOT')) {
+      throw new GradleException("You cannot specify -Prelease with a SNAPSHOT version")
+    }
+    if (project.hasProperty('snapshot') && !project.version.endsWith('SNAPSHOT')) {
+      throw new GradleException("You cannot specify -Psnapshot with a non-SNAPSHOT version")
+    }
+    project.ext.shouldPublish = true
+  }
+}
+
+// Ensure checkVersion runs before publishing
+tasks.named('publish').configure {
+  dependsOn checkVersion
+}
+
 javadoc {
   if (JavaVersion.current().isJava9Compatible()) {
     options.addBooleanOption('html5', true)