Skip to content

Commit

Permalink
Merge branch 'master' into feature/#190-Server-endpoints-v2-returning…
Browse files Browse the repository at this point in the history
…-the-checkpoins-data-of-a-partitioning
  • Loading branch information
TebaleloS authored Jun 11, 2024
2 parents b6b35b6 + e4e0420 commit ca79884
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/release_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ jobs:

- name: Find JAR file
id: find_jar
run: echo "JAR_PATH=$(find . -name 'server/target/jvm-2.13/*.jar' | head -n 1)" >> $GITHUB_ENV
run: echo "JAR_PATH=$(find server/target/jvm-2.13/ -type f -name 'atum-server-assembly-*.jar' | head -n 1)" >> $GITHUB_ENV

- 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 }}
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 ca79884

Please sign in to comment.