From efc24b5e36d82628b0c9f2a1b62a87b9b0a0d043 Mon Sep 17 00:00:00 2001
From: Thayne McCombs <thayne@lucidchart.com>
Date: Thu, 16 Oct 2025 13:47:32 -0600
Subject: [PATCH 1/2] fix: A couple minor tweeks to build

Don't set the version in worker/build.sbt, because the ci-release plugin takes care of that.

Specify that we want to use the sbt cache for the java setup
---
 .github/workflows/ci.yml | 1 +
 worker/build.sbt         | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2518ff1..c0dc7de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,6 +18,7 @@ jobs:
         with:
           java-version: '21'
           distribution: 'corretto'
+          cache: sbt
       - uses: sbt/setup-sbt@v1
       - name: Set Env
         if: ${{ github.repository == 'lucidsoftware/piezo' }}
diff --git a/worker/build.sbt b/worker/build.sbt
index 1d3f148..45f0c0b 100644
--- a/worker/build.sbt
+++ b/worker/build.sbt
@@ -36,5 +36,3 @@ scalacOptions ++= Seq(
 )
 
 Compile / unmanagedClasspath += sourceDirectory.value / "run" / "resources"
-
-version := sys.props.getOrElse("build.version", "0.0-SNAPSHOT")

From 5af28761fb58c93e8ff5539ab4c16dd06f0ecb9e Mon Sep 17 00:00:00 2001
From: Thayne McCombs <thayne@lucidchart.com>
Date: Thu, 16 Oct 2025 13:58:56 -0600
Subject: [PATCH 2/2] fix[build]: Make sure we build the debian package

---
 .github/workflows/ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c0dc7de..0b8654e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,12 +39,13 @@ jobs:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         run: sbt ci-release
+      - name: Build final packages
+        if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
+        run: sbt Universal/packageBin Debian/packageBin
       # TODO: publish deb somewhere?
       - name: Upload assets to Github
         if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          set -x
-          sbt Universal/packageBin
           gh release create -t "Release $VERSION" --generate-notes $VERSION {admin,worker}/target/**/*.jar admin/target/*.deb admin/target/universal/piezo-admin*.zip