From 95e48ea0b26983863172fc1a7b64abfd32dbc372 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Mon, 27 Jan 2025 15:53:23 +0100 Subject: [PATCH 1/2] Don't touch GCP from GH workflows --- .github/workflows/ci.yml | 3 --- .github/workflows/flex-templates.yml | 6 +++--- .github/workflows/tf-apply.yml | 6 +++--- .github/workflows/tf-plan.yml | 2 +- build.sbt | 2 +- project/Settings.scala | 2 ++ 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22c70713..a7960a7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,8 +40,5 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ./.github/actions/setup - - uses: google-github-actions/auth@v2 - with: - credentials_json: "${{ secrets.GOOGLE_CREDENTIALS }}" - run: sbt jacoco - uses: codecov/codecov-action@v5 diff --git a/.github/workflows/flex-templates.yml b/.github/workflows/flex-templates.yml index 143eed47..bcb3db20 100644 --- a/.github/workflows/flex-templates.yml +++ b/.github/workflows/flex-templates.yml @@ -2,9 +2,9 @@ name: Build flex templates on: workflow_dispatch: ~ - push: - branches: - - main +# push: +# branches: +# - main jobs: assembly: diff --git a/.github/workflows/tf-apply.yml b/.github/workflows/tf-apply.yml index 8576540b..b99acbb2 100644 --- a/.github/workflows/tf-apply.yml +++ b/.github/workflows/tf-apply.yml @@ -2,9 +2,9 @@ name: Terraform apply on: workflow_dispatch: ~ - push: - branches: - - main +# push: +# branches: +# - main permissions: contents: read diff --git a/.github/workflows/tf-plan.yml b/.github/workflows/tf-plan.yml index c244b413..71b935d2 100644 --- a/.github/workflows/tf-plan.yml +++ b/.github/workflows/tf-plan.yml @@ -2,7 +2,7 @@ name: Terraform plan on: workflow_dispatch: ~ - pull_request: ~ +# pull_request: ~ permissions: contents: read diff --git a/build.sbt b/build.sbt index a53509b8..41157d7c 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ import sbt._ import Dependencies._ import Settings._ -addCommandAlias("check", "clean; scalafixAll; scalafmtAll; scapegoat; testOnly -- -l org.scalatest.tags.Slow") +addCommandAlias("check", "clean; scalafixAll; scalafmtAll; scapegoat; test") lazy val root = (project in file(".")) .settings( diff --git a/project/Settings.scala b/project/Settings.scala index 0524a181..e43c3e32 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -40,6 +40,8 @@ object Settings { updateOptions := updateOptions.value.withCachedResolution(true), // required by beam-runners-google-cloud-dataflow-java resolvers += "confluent" at "https://packages.confluent.io/maven/", + // disable integration tests by default + Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-l", "org.scalatest.tags.Slow"), // use jcl-over-slf4j bridge instead of common-logging excludeDependencies += "commons-logging" % "commons-logging", // pin jackson From c6b87b89a1f173a60ab966fcb739743a52787616 Mon Sep 17 00:00:00 2001 From: Marcin Kuthan Date: Mon, 27 Jan 2025 16:04:42 +0100 Subject: [PATCH 2/2] Fix --- project/Settings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Settings.scala b/project/Settings.scala index e43c3e32..dc30fcc4 100644 --- a/project/Settings.scala +++ b/project/Settings.scala @@ -41,7 +41,7 @@ object Settings { // required by beam-runners-google-cloud-dataflow-java resolvers += "confluent" at "https://packages.confluent.io/maven/", // disable integration tests by default - Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-l", "org.scalatest.tags.Slow"), + Test / testOptions += Tests.Argument("-l", "org.scalatest.tags.Slow"), // use jcl-over-slf4j bridge instead of common-logging excludeDependencies += "commons-logging" % "commons-logging", // pin jackson