Publish to GH Packages (#43)

Also includes a basic versioning scheme that will need to be revisited
before shipping the next minor version.

# Versioning Scheme

The `build.gradle.kts` file includes the following logic for generating
the version identifier:

`version = "$baseVersion.$commitCount-preview+g$gitHash$safeBranchName"`

* `baseVersion` is set to `BASE_VERSION` env var, with `0.5` as a
fallback
* `commitCount` is the number of commits, retrieved via `git rev-list
--count HEAD`
* `gitHash` is the short git hash, retrieved via ` git rev-parse --short
HEAD`
* `safeBranchName` is the branch name, with `/` replaced with `-`.
Omitted if branch name is `main` or `HEAD`

An example version identifier from my local machine is
`0.5.302-preview+ga068c39.devhawk-version`.

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: devhawk

.github/workflows/on_push.yml

@@ -8,4 +8,9 @@ on:
 
 jobs:
   test:
-    uses: ./.github/workflows/test.yml
+    uses: ./.github/workflows/test.yml
+  publish:
+    uses: ./.github/workflows/publish.yml
+    secrets:
+      USERNAME_MAVEN: ${{ secrets.USERNAME_MAVEN }}
+      TOKEN_MAVEN: ${{ secrets.TOKEN_MAVEN }}

.github/workflows/publish.yml

@@ -0,0 +1,33 @@
+name: Publish
+
+on:
+  workflow_call:
+   secrets:
+    USERNAME_MAVEN:
+      required: true
+    TOKEN_MAVEN:
+      required: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # fetch-depth 0 needed for version calculation
+
+      - name: Set up OpenJDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+
+      - name: Publish
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: publish
+        env:
+          # GitHub Packages credentials stored as repository secrets
+          USERNAME: ${{ secrets.USERNAME_MAVEN }}
+          TOKEN: ${{ secrets.TOKEN_MAVEN }}

.github/workflows/test.yml

@@ -50,7 +50,9 @@ jobs:
           PGPASSWORD: dbos
 
       - name: Run tests
-        run: ./gradlew clean test
+        uses: gradle/gradle-build-action@v2
+        with:
+          arguments: clean test
         env:
           PGPASSWORD: dbos
 
@@ -61,4 +63,4 @@ jobs:
           name: test-results
           path: |
             build/reports/tests/
-            build/test-results/
+            build/test-results/

build.gradle.kts

@@ -1,3 +1,51 @@
+import java.io.ByteArrayOutputStream
+
+// Get the short Git hash
+val gitHash: String by lazy {
+    ByteArrayOutputStream().also { stdout ->
+        exec {
+            commandLine = listOf("git", "rev-parse", "--short", "HEAD")
+            standardOutput = stdout
+        }
+    }.toString().trim()
+}
+
+// Get the commit count
+val commitCount: String by lazy {
+    ByteArrayOutputStream().also { stdout ->
+        exec {
+            commandLine = listOf("git", "rev-list", "--count", "HEAD")
+            standardOutput = stdout
+        }
+    }.toString().trim()
+}
+
+// Get the current branch name
+val branchName: String by lazy {
+    // First, try GitHub Actions environment variable
+    val githubBranch = System.getenv("GITHUB_REF_NAME")
+    if (!githubBranch.isNullOrBlank()) githubBranch
+
+    // Fallback to local git command
+    else {
+        ByteArrayOutputStream().also { stdout ->
+            exec {
+                commandLine = listOf("git", "rev-parse", "--abbrev-ref", "HEAD")
+                standardOutput = stdout
+            }
+        }.toString().trim()
+    }
+}
+
+// Note, this versioning scheme is fine for preview releases
+// but we'll want something more robust once we want to bump
+// the major or minor version number
+val baseVersion = System.getenv("BASE_VERSION") ?: "0.5"
+val safeBranchName = if (branchName == "main" || branchName == "HEAD") "" else ".${branchName.replace("/", "-")}"
+version = "$baseVersion.$commitCount-preview+g$gitHash$safeBranchName"
+
+println("Project version: $version") // prints when Gradle evaluates the build
+
 plugins {
     id("java")
     id("java-library")
@@ -6,7 +54,6 @@ plugins {
 }
 
 group = "dev.dbos"
-version = "1.0-SNAPSHOT"
 
 tasks.withType<JavaCompile> {
     options.release.set(11) // Targets Java 11 bytecode (RECOMMENDED)
@@ -85,15 +132,23 @@ publishing {
 
     publications {
         create<MavenPublication>("mavenJava") {
-
-            // change in
-            artifactId = "transact"
-
             from(components["java"])
-
+            artifactId = "transact"
+            groupId = project.group.toString()
+            version = project.version.toString()
         }
     }
     repositories {
         mavenLocal()
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/dbos-inc/dbos-transact-java") // replace OWNER/REPO
+            credentials {
+                username = project.findProperty("gpr.user")?.toString()
+                    ?: System.getenv("USERNAME")
+                password = project.findProperty("gpr.token")?.toString()
+                    ?: System.getenv("TOKEN")
+            }
+        }
     }
-}
+}

src/main/java/dev/dbos/transact/conductor/protocol/RetentionRequest.java

@@ -9,7 +9,8 @@ public static class RetentionBody {
         public Long timeout_cutoff_epoch_ms;
     }
 
-    public RetentionRequest() {}
+    public RetentionRequest() {
+    }
 
     public RetentionRequest(String requestId, Long gcCutoff, Long gcRowsThreshold, Long timeoutCutoff) {
         this.type = MessageType.RETENTION.getValue();

src/test/java/dev/dbos/transact/workflow/GCServiceImpl.java

@@ -1,10 +1,10 @@
 package dev.dbos.transact.workflow;
 
-import java.util.concurrent.CountDownLatch;
-
 import dev.dbos.transact.DBOS;
 import dev.dbos.transact.context.DBOSContextHolder;
 
+import java.util.concurrent.CountDownLatch;
+
 public class GCServiceImpl implements GCService {
 
     GCService self;

src/test/java/dev/dbos/transact/workflow/WorkflowMgmtTest.java

@@ -527,7 +527,8 @@ void globalTimeout() throws Exception {
 
         Thread.sleep(1000L);
 
-        // Wait one second, start one final workflow, then timeout all workflows started more than one second ago
+        // Wait one second, start one final workflow, then timeout all workflows started
+        // more than one second ago
         WorkflowHandle<String> finalHandle = dbos.startWorkflow(() -> gcService.timeoutBlockedWorkflow());
 
         dbosExecutor.globalTimeout(System.currentTimeMillis() - 1000);