From e4e0420952f02c0ea309c549376c5328048b25ef Mon Sep 17 00:00:00 2001
From: David Benedeki <benedeki@volny.cz>
Date: Sat, 8 Jun 2024 08:48:36 +0200
Subject: [PATCH] Fixing release to Sonatype * in `release_publish.yml` running
 `sbt ci-release` without module specification * removed double info print out
 in `release_publish.yml` * removed re-definition of testDb sbt command in
 `build.sbt`

---
 .github/workflows/release_publish.yml |  8 +-------
 build.sbt                             | 12 +++---------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release_publish.yml b/.github/workflows/release_publish.yml
index 778901392..b349a8ff6 100644
--- a/.github/workflows/release_publish.yml
+++ b/.github/workflows/release_publish.yml
@@ -36,7 +36,7 @@ jobs:
           java-version: "adopt@1.8"
 
       - name: Run sbt ci-release
-        run: sbt "project model" ci-release "project agent_spark3" ci-release
+        run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
@@ -71,12 +71,6 @@ jobs:
           echo "Published file: ${{ env.JAR_PATH }}"
           echo "In repo: ${{ github.repository }}"
 
-      - name: Info on publish
-        run: |
-          echo "Server release: ${{ github.event.release.tag_name }}"
-          echo "Published file: ${{ env.JAR_PATH }}"
-          echo "In repo: ${{ github.repository }}"
-
       - name: Upload JAR file to GitHub Release
         run: gh release upload ${{ github.event.release.tag_name }} ${{ env.JAR_PATH }} --repo ${{ github.repository }}
         env:
diff --git a/build.sbt b/build.sbt
index 44d7d40c1..9d7686d0e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -55,7 +55,8 @@ lazy val server = (projectMatrix in file("server"))
       packageBin := (Compile / assembly).value,
       artifactPath / (Compile / packageBin) := baseDirectory.value / s"target/${name.value}-${version.value}.jar",
       testFrameworks += new TestFramework("zio.test.sbt.ZTestFramework"),
-      Setup.serverMergeStrategy
+      Setup.serverMergeStrategy,
+      publish / skip := true
     ): _*
   )
   .enablePlugins(AssemblyPlugin)
@@ -99,15 +100,8 @@ lazy val database = (projectMatrix in file("database"))
     Setup.commonSettings ++ Seq(
       name := "atum-database",
       javacOptions ++= Setup.serverAndDbJavacOptions,
-      test := {}
+      publish / skip := true
     ): _*
   )
   .addSingleScalaBuild(Setup.serverAndDbScalaVersion, Dependencies.databaseDependencies)
 
-//----------------------------------------------------------------------------------------------------------------------
-lazy val dbTest = taskKey[Unit]("Launch DB tests")
-
-dbTest := {
-  println("Running DB tests")
-  (database.jvm(Setup.serverAndDbScalaVersion.asString) / Test / test).value
-}