Skip to content

Commit

Permalink
Merge branch 'master' into feature/188-server-part-of-get-flow-checkp…
Browse files Browse the repository at this point in the history
…oints
  • Loading branch information
lsulak authored Jun 12, 2024
2 parents 71ee83d + e4e0420 commit 4805305
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/release_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
java-version: "[email protected]"

- 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 }}
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 3 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
}

0 comments on commit 4805305

Please sign in to comment.