Publish fixes (#12)

* Remove deprecated syntax

* Revert "Set version to 0.0.2-SNAPSHOT"

This reverts commit a1d8276.

* Try to fix publish, add mergify / codecov

* 0.0.1-SNAPSHOT

* Auto stash before merge of "publishFixes" and "origin/publishFixes"

* add printing of docker logs if the CI fails

* move functional tests outside of coverage command

* turn coverage off after complete

.codecov.yml

@@ -0,0 +1,5 @@
+coverage:
+  status:
+    project:
+      default:
+        threshold: 5%

.github/workflows/publish.yml

@@ -18,9 +18,7 @@ jobs:
     - name: Build docker image
       run: sbt packageAndBuildDockerImage
     - name: Login to registry
-      env:
-        GITHUB_TOKEN: ${{ secrets.CR_PAT }}
-      run: docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
+      run: echo ${{ secrets.CR_PAT }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
     - name: Push to registry
       run: ghcr.io/etspaceman/kinesis-mock:${{ github.event.release.tag_name }}
     - name: Upload JAR To Release

.github/workflows/scala.yml

@@ -23,4 +23,9 @@ jobs:
       run: sbt validate
       env:
         CBOR_ENABLED: ${{ matrix.cbor_enabled }}
-        SERVICE_PORT: ${{ matrix.service_port }}
+        SERVICE_PORT: ${{ matrix.service_port }}
+    - name: Print Docker Logs
+      if: ${{ failure() }}
+      run: sbt dockerComposeLogs
+    - name: Upload coverage
+      uses: codecov/codecov-action@v1

.mergify.yml

@@ -0,0 +1,22 @@
+pull_request_rules:
+  - name: assign and label scala-steward's PRs
+    conditions:
+      - author=scala-steward
+    actions:
+      assign:
+        users: [etspaceman]
+      label:
+        add: [dependency-update]
+  - name: merge scala-steward's PRs
+    conditions:
+      - author=scala-steward
+      - status-success=build (false, 4567)
+      - status-success=build (false, 4568)
+      - status-success=build (true, 4567)
+      - status-success=build (true, 4568)
+      - status-success=codecov/patch
+      - status-success=codecov/project
+    actions:
+      merge:
+        method: squash
+        strict: true

build.sbt

@@ -105,9 +105,13 @@ lazy val kinesisMock = project
         "prettyCheck",
         ";fixCheck;fmtCheck"
       ),
+      addCommandAlias(
+        "cov",
+        ";clean;coverage;test;coverageReport;coverageOff"
+      ),
       addCommandAlias(
         "validate",
-        ";cpl;prettyCheck;test;fun:dockerComposeTestQuick"
+        ";cov;Fun / dockerComposeTestQuick;prettyCheck"
       )
     ).flatten
   )

project/DockerComposePlugin.scala

@@ -40,7 +40,7 @@ object DockerComposePlugin extends AutoPlugin {
       val res = Process(
         cmd,
         None,
-        "DOCKER_TAG_VERSION" -> (version in ThisBuild).value,
+        "DOCKER_TAG_VERSION" -> (ThisBuild / version).value,
         "DOCKER_NET_NAME" -> networkName.value,
         "COMPOSE_PROJECT_NAME" -> composeProjectName.value
       ).!
@@ -64,7 +64,7 @@ object DockerComposePlugin extends AutoPlugin {
     val res = Process(
       cmd,
       None,
-      "DOCKER_TAG_VERSION" -> (version in ThisBuild).value,
+      "DOCKER_TAG_VERSION" -> (ThisBuild / version).value,
       "DOCKER_NET_NAME" -> networkName.value,
       "COMPOSE_PROJECT_NAME" -> composeProjectName.value
     ).!
@@ -79,7 +79,7 @@ object DockerComposePlugin extends AutoPlugin {
     val res = Process(
       cmd,
       None,
-      "DOCKER_TAG_VERSION" -> (version in ThisBuild).value,
+      "DOCKER_TAG_VERSION" -> (ThisBuild / version).value,
       "DOCKER_NET_NAME" -> networkName.value,
       "COMPOSE_PROJECT_NAME" -> composeProjectName.value
     ).!
@@ -102,7 +102,7 @@ object DockerComposePlugin extends AutoPlugin {
     val res = Process(
       cmd,
       None,
-      "DOCKER_TAG_VERSION" -> (version in ThisBuild).value,
+      "DOCKER_TAG_VERSION" -> (ThisBuild / version).value,
       "DOCKER_NET_NAME" -> networkName.value,
       "COMPOSE_PROJECT_NAME" -> composeProjectName.value
     ).!
@@ -115,7 +115,7 @@ object DockerComposePlugin extends AutoPlugin {
   ): Def.Initialize[Task[Unit]] =
     Def.sequential(
       dockerComposeUp,
-      test in configuration,
+      configuration / test,
       dockerComposeDown
     )
 

project/DockerImagePlugin.scala

@@ -32,7 +32,7 @@ object DockerImagePlugin extends AutoPlugin {
 
   val packageAndBuildDockerImageTask: Def.Initialize[Task[Unit]] =
     buildDockerImageTask
-      .dependsOn(assembly in Compile)
+      .dependsOn(Compile / assembly)
 
   val pushDockerImageTask: Def.Initialize[Task[Unit]] = Def.task {
     val log = sbt.Keys.streams.value.log
@@ -49,13 +49,13 @@ object DockerImagePlugin extends AutoPlugin {
       buildDockerImage := buildDockerImageTask.value,
       packageAndBuildDockerImage := packageAndBuildDockerImageTask.value,
       pushDockerImage := pushDockerImageTask.value,
-      imageTag := (version in ThisBuild).value,
+      imageTag := (ThisBuild / version).value,
       dockerRepository := "ghcr.io",
       dockerNamespace := "etspaceman",
       jarLocation := "docker/image/lib/",
       dockerfileLocation := "docker/",
       dockerfile := "Dockerfile",
-      assemblyOutputPath in assembly := file(
+      assembly / assemblyOutputPath := file(
         s"${jarLocation.value + name.value}.jar"
       )
     )

project/plugins.sbt

@@ -1,3 +1,4 @@
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.26")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "0.0.2-SNAPSHOT"
+ThisBuild / version := "0.0.1-SNAPSHOT"