From b1f47066624bbfa08933dd2f92dafb109f5a1dc6 Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Mon, 21 Aug 2023 11:52:36 +0200 Subject: [PATCH 1/3] sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 875b706a8..52413ab79 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.2 +sbt.version=1.9.3 From 9bab99efbf8e0dbbc6f8b10210573d4833e5dcad Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Tue, 22 Aug 2023 12:48:41 +0200 Subject: [PATCH 2/3] latest codegen with generateDomainClassesCheck --- .github/workflows/pr.yml | 4 ++++ .github/workflows/release.yml | 4 ++++ build.sbt | 2 +- project/plugins.sbt | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7077ab987..71ff10db7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -27,3 +27,7 @@ jobs: run: sbt scalafmtCheck Test/scalafmtCheck - run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'" if: ${{ failure() }} + - name: Check domain classes + run: sbt generateDomainClassesCheck + - run: echo "Previous step failed because latest domain classes are not committed. Run 'sbt generateDomainClasses' (should be triggered automatically by `sbt compile`, so maybe you just forgot to commit?)" + if: ${{ failure() }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 38b3a176e..036a4e178 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,6 +26,10 @@ jobs: run: sbt scalafmtCheck Test/scalafmtCheck - run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'" if: ${{ failure() }} + - name: Check domain classes + run: sbt generateDomainClassesCheck + - run: echo "Previous step failed because latest domain classes are not committed. Run 'sbt generateDomainClasses' (should be triggered automatically by `sbt compile`, so maybe you just forgot to commit?)" + if: ${{ failure() }} - name: Compile and run tests run: sbt +test diff --git a/build.sbt b/build.sbt index 02a74551b..856586284 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ name := "codepropertygraph" // parsed by project/Versions.scala, updated by updateDependencies.sh val overflowdbVersion = "1.180" -val overflowdbCodegenVersion = "2.101" +val overflowdbCodegenVersion = "2.102+4-cb0f31bb" inThisBuild( List( diff --git a/project/plugins.sbt b/project/plugins.sbt index af58dbcbb..ac8cffd2c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0") addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.18") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.5") -addSbtPlugin("io.shiftleft" % "sbt-overflowdb" % "2.99") +addSbtPlugin("io.shiftleft" % "sbt-overflowdb" % "2.102+4-cb0f31bb") From 3df0b1457970a864aa55b65b96cc631970ce0d69 Mon Sep 17 00:00:00 2001 From: Michael Pollmeier Date: Thu, 24 Aug 2023 09:36:34 +0200 Subject: [PATCH 3/3] use released version --- build.sbt | 4 ++-- project/plugins.sbt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 856586284..c9e7e50d1 100644 --- a/build.sbt +++ b/build.sbt @@ -1,8 +1,8 @@ name := "codepropertygraph" // parsed by project/Versions.scala, updated by updateDependencies.sh -val overflowdbVersion = "1.180" -val overflowdbCodegenVersion = "2.102+4-cb0f31bb" +val overflowdbVersion = "1.181" +val overflowdbCodegenVersion = "2.103" inThisBuild( List( diff --git a/project/plugins.sbt b/project/plugins.sbt index ac8cffd2c..844d70bfe 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,4 +4,4 @@ addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0") addSbtPlugin("io.shiftleft" % "sbt-ci-release-early" % "2.0.18") addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.5") -addSbtPlugin("io.shiftleft" % "sbt-overflowdb" % "2.102+4-cb0f31bb") +addSbtPlugin("io.shiftleft" % "sbt-overflowdb" % "2.103")