From 4c7c8ff3a4af6ffb64ba21884f994f0d50cc4dd0 Mon Sep 17 00:00:00 2001 From: Yann Bouzonie Date: Mon, 22 Jan 2024 16:01:19 +0100 Subject: [PATCH] fix(snapi-truffle)(cd): publish tasks shoudl depend on runJavaAnnotationProcessor (#335) We make sure to run `runJavaAnnotationProcessor` task before compiling/publishing --- snapi-truffle/build.sbt | 8 ++++++-- snapi-truffle/build.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/snapi-truffle/build.sbt b/snapi-truffle/build.sbt index 6b0e47e93..c891d6e4c 100644 --- a/snapi-truffle/build.sbt +++ b/snapi-truffle/build.sbt @@ -6,6 +6,8 @@ import Dependencies.* import scala.sys.process.Process +import com.jsuereth.sbtpgp.PgpKeys.{publishSigned} + ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org" sonatypeRepository := "https://s01.oss.sonatype.org/service/local" @@ -193,8 +195,6 @@ resolvers += Resolver.sonatypeRepo("releases") // Publish settings Test / publishArtifact := true Compile / packageSrc / publishArtifact := true -// When doing publishLocal, also publish to the local maven repository. -publishLocal := (publishLocal dependsOn publishM2).value // Dependencies libraryDependencies ++= Seq( @@ -220,3 +220,7 @@ outputVersion := { } Compile / compile := ((Compile / compile) dependsOn outputVersion).value + +publishLocal := (publishLocal dependsOn Def.sequential(runJavaAnnotationProcessor, outputVersion, publishM2)).value +publish := (publish dependsOn Def.sequential(runJavaAnnotationProcessor, outputVersion)).value +publishSigned := (publishSigned dependsOn Def.sequential(runJavaAnnotationProcessor, outputVersion)).value diff --git a/snapi-truffle/build.sh b/snapi-truffle/build.sh index 64feb0572..ba49405f4 100755 --- a/snapi-truffle/build.sh +++ b/snapi-truffle/build.sh @@ -7,4 +7,4 @@ yes | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce cd "$SCRIPT_HOME" -sbt clean runJavaAnnotationProcessor publishLocal +sbt clean publishLocal