From 460418ee2eb1e0734e035755ae5051c10698b211 Mon Sep 17 00:00:00 2001 From: Enno Runne <458526+ennru@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:02:05 +0100 Subject: [PATCH] Standardise naming --- .github/workflows/check-build-test.yml | 13 +++++++------ build.sbt | 15 +++++++-------- .../src/test/resources/logback-test.xml | 0 .../src/test/resources/reference.conf | 0 .../scala/akka/kafka/ConnectionCheckerSpec.scala | 0 .../test/scala/akka/kafka/IntegrationTests.scala | 0 .../test/scala/akka/kafka/MultiConsumerSpec.scala | 0 .../kafka/PartitionedSourceFailoverSpec.scala | 0 .../akka/kafka/PlainSourceFailoverSpec.scala | 0 .../scala/akka/kafka/RetentionPeriodSpec.scala | 0 .../kafka/TransactionsPartitionedSourceSpec.scala | 0 .../scala/akka/kafka/TransactionsSourceSpec.scala | 0 12 files changed, 14 insertions(+), 14 deletions(-) rename {integrationTests => integration-tests}/src/test/resources/logback-test.xml (100%) rename {integrationTests => integration-tests}/src/test/resources/reference.conf (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/IntegrationTests.scala (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/MultiConsumerSpec.scala (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/PartitionedSourceFailoverSpec.scala (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/PlainSourceFailoverSpec.scala (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/RetentionPeriodSpec.scala (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/TransactionsPartitionedSourceSpec.scala (100%) rename {integrationTests => integration-tests}/src/test/scala/akka/kafka/TransactionsSourceSpec.scala (100%) diff --git a/.github/workflows/check-build-test.yml b/.github/workflows/check-build-test.yml index 3b6827c85..92c16e776 100644 --- a/.github/workflows/check-build-test.yml +++ b/.github/workflows/check-build-test.yml @@ -80,8 +80,8 @@ jobs: jvm: temurin:1.11 - name: Compile all code with fatal warnings for Java 11 and all Scala versions - # Run locally with: env CI=true sbt 'clean ; Test/compile' - run: sbt "+Test/compile" + # Run locally with: env CI=true sbt 'clean ; Test/compile; integration-tests/Test/compile' + run: sbt "+Test/compile; +integration-tests/Test/compile" check-docs: name: Check Docs @@ -116,7 +116,7 @@ jobs: # Run locally with: sbt verifyDocs run: sbt docs/makeSite - test: + tests: name: Build and Test runs-on: ubuntu-22.04 needs: [check-code-style, check-code-compilation, check-docs] @@ -124,7 +124,7 @@ jobs: fail-fast: false matrix: include: - - { java-version: 'temurin:1.11', sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' } + - { java-version: 'temurin:1.11', sbt-opts: '-J-XX:+UnlockExperimentalVMOptions' } steps: - name: Checkout # https://github.com/actions/checkout/releases @@ -158,7 +158,7 @@ jobs: if: ${{ failure() }} run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \; - integration-test: + integration-tests: name: Integration tests needs: [check-code-style, check-code-compilation, check-docs] runs-on: ubuntu-22.04 @@ -189,11 +189,12 @@ jobs: jvm: temurin:1.11 - name: Run multi-broker and long running integration tests - run: sbt "integrationTests/test" + run: sbt "integration-tests/test" - name: Print logs on failure if: ${{ failure() }} run: find . -name "*.log" -exec ./scripts/cat-log.sh {} \; + build-benchmark: name: Build benchmarks needs: [check-code-style, check-code-compilation, check-docs] diff --git a/build.sbt b/build.sbt index 87edb9dd2..8fd8aa63d 100644 --- a/build.sbt +++ b/build.sbt @@ -172,8 +172,7 @@ lazy val `alpakka-kafka` = .settings(commonSettings) .settings( publish / skip := true, - // TODO: add clusterSharding to unidocProjectFilter when we drop support for Akka 2.5 - ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(core, testkit), + ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(core, testkit, `cluster-sharding`), onLoadMessage := """ |** Welcome to the Alpakka Kafka connector! ** @@ -203,7 +202,7 @@ lazy val `alpakka-kafka` = | test | runs all the tests, most using Kafka in TestContainers | - | integrationTests/test + | integration-tests/test | run integration tests using multiple Kafka brokers via TestContainers | | tests/testOnly -- -t "A consume-transform-produce cycle must complete in happy-path scenario" @@ -213,7 +212,7 @@ lazy val `alpakka-kafka` = | run a single benchmark backed by Docker containers """.stripMargin ) - .aggregate(core, testkit, clusterSharding, tests, integrationTests, benchmarks, docs) + .aggregate(core, testkit, `cluster-sharding`, tests, benchmarks, docs) lazy val core = project .enablePlugins(AutomateHeaderPlugin) @@ -260,8 +259,7 @@ lazy val testkit = project ) .settings(Scala3Settings) -lazy val clusterSharding = project - .in(file("./cluster-sharding")) +lazy val `cluster-sharding` = project .dependsOn(core) .enablePlugins(AutomateHeaderPlugin) .disablePlugins(SitePlugin, CiReleasePlugin) @@ -280,7 +278,7 @@ lazy val clusterSharding = project .settings(Scala3Settings) lazy val tests = project - .dependsOn(core, testkit, clusterSharding) + .dependsOn(core, testkit, `cluster-sharding`) .enablePlugins(AutomateHeaderPlugin) .disablePlugins(MimaPlugin, SitePlugin, CiReleasePlugin) .settings(commonSettings) @@ -318,7 +316,8 @@ lazy val tests = project Test / parallelExecution := false ) -lazy val integrationTests = project + +lazy val `integration-tests` = project .dependsOn(core, testkit, tests) .enablePlugins(AutomateHeaderPlugin) .disablePlugins(MimaPlugin, SitePlugin, CiReleasePlugin) diff --git a/integrationTests/src/test/resources/logback-test.xml b/integration-tests/src/test/resources/logback-test.xml similarity index 100% rename from integrationTests/src/test/resources/logback-test.xml rename to integration-tests/src/test/resources/logback-test.xml diff --git a/integrationTests/src/test/resources/reference.conf b/integration-tests/src/test/resources/reference.conf similarity index 100% rename from integrationTests/src/test/resources/reference.conf rename to integration-tests/src/test/resources/reference.conf diff --git a/integrationTests/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala b/integration-tests/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala rename to integration-tests/src/test/scala/akka/kafka/ConnectionCheckerSpec.scala diff --git a/integrationTests/src/test/scala/akka/kafka/IntegrationTests.scala b/integration-tests/src/test/scala/akka/kafka/IntegrationTests.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/IntegrationTests.scala rename to integration-tests/src/test/scala/akka/kafka/IntegrationTests.scala diff --git a/integrationTests/src/test/scala/akka/kafka/MultiConsumerSpec.scala b/integration-tests/src/test/scala/akka/kafka/MultiConsumerSpec.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/MultiConsumerSpec.scala rename to integration-tests/src/test/scala/akka/kafka/MultiConsumerSpec.scala diff --git a/integrationTests/src/test/scala/akka/kafka/PartitionedSourceFailoverSpec.scala b/integration-tests/src/test/scala/akka/kafka/PartitionedSourceFailoverSpec.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/PartitionedSourceFailoverSpec.scala rename to integration-tests/src/test/scala/akka/kafka/PartitionedSourceFailoverSpec.scala diff --git a/integrationTests/src/test/scala/akka/kafka/PlainSourceFailoverSpec.scala b/integration-tests/src/test/scala/akka/kafka/PlainSourceFailoverSpec.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/PlainSourceFailoverSpec.scala rename to integration-tests/src/test/scala/akka/kafka/PlainSourceFailoverSpec.scala diff --git a/integrationTests/src/test/scala/akka/kafka/RetentionPeriodSpec.scala b/integration-tests/src/test/scala/akka/kafka/RetentionPeriodSpec.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/RetentionPeriodSpec.scala rename to integration-tests/src/test/scala/akka/kafka/RetentionPeriodSpec.scala diff --git a/integrationTests/src/test/scala/akka/kafka/TransactionsPartitionedSourceSpec.scala b/integration-tests/src/test/scala/akka/kafka/TransactionsPartitionedSourceSpec.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/TransactionsPartitionedSourceSpec.scala rename to integration-tests/src/test/scala/akka/kafka/TransactionsPartitionedSourceSpec.scala diff --git a/integrationTests/src/test/scala/akka/kafka/TransactionsSourceSpec.scala b/integration-tests/src/test/scala/akka/kafka/TransactionsSourceSpec.scala similarity index 100% rename from integrationTests/src/test/scala/akka/kafka/TransactionsSourceSpec.scala rename to integration-tests/src/test/scala/akka/kafka/TransactionsSourceSpec.scala