Unify build, workflows, update docs

trace4cats · Jul 6, 2021 · 1e83029 · 1e83029
1 parent f97f349
commit 1e83029
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 135 deletions.
diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -1,59 +1,39 @@
 pull_request_rules:
-  - name: request reviews and label scala-steward's PRs
+  - name: Request reviews and label Stewards' PRs
     conditions:
-      - author=scala-steward
+      - or:
+          - author=scala-steward
+          - author=trace4cats-steward[bot]
     actions:
       request_reviews:
-        users: [janstenpickle, catostrophe]
+        users: [ janstenpickle, catostrophe ]
       label:
-        add: [dependency-update]
+        add: [ dependency-update ]
 
-  - name: automatically merge scala-steward's PRs affecting project plugins
+  - name: Merge Stewards' PRs
     conditions:
-      - author=scala-steward
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
-      - "#files=1"
-      - files=project/plugins.sbt
+      - or:
+          - author=scala-steward
+          - author=trace4cats-steward[bot]
+      - or:
+          - and:
+              - "#files=1"
+              - or:
+                  - files=project/build.properties
+                  - files=project/plugins.sbt
+          - body~=labels:.*semver-patch
+          - "#approved-reviews-by>=1"
+      - and:
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
+          - check-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
+          - check-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
     actions:
       merge:
-        method: merge
+        method: rebase
 
-  - name: automatically merge scala-steward's PRs affecting project build properties
+  - name: Delete head branch after merge
     conditions:
-      - author=scala-steward
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
-      - "#files=1"
-      - files=project/build.properties
+      - merged
     actions:
-      merge:
-        method: merge
-
-  - name: automatically merge scala-steward's PRs updating semver-patch versions
-    conditions:
-      - author=scala-steward
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
-      - body~=labels:.*semver-patch
-    actions:
-      merge:
-        method: merge
-
-  - name: automatically merge other scala-steward's PRs reviewed by 1 maintainer
-    conditions:
-      - author=scala-steward
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.12\.\d+, adopt@1\.11\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.8\)
-      - status-success~=Test \(ubuntu-latest, 2\.13\.\d+, adopt@1\.11\)
-      - "#approved-reviews-by>=1"
-    actions:
-      merge:
-        method: merge
+      delete_head_branch:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,8 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - run: sbt --client '++${{ matrix.scala }}; scalafmtCheckAll; scalafmtSbtCheck'
+      - name: Check formatting
+        run: sbt --client '++${{ matrix.scala }}; scalafmtCheckAll; scalafmtSbtCheck'
 
       - name: Check that workflows are up to date
         run: sbt --client '++${{ matrix.scala }}; githubWorkflowCheck'

diff --git a/build.sbt b/build.sbt
@@ -54,7 +54,6 @@ lazy val example = (project in file("modules/example"))
       Dependencies.trace4catsZio,
       Dependencies.trace4catsNatchez,
       Dependencies.trace4catsSttpClient3,
-      Dependencies.trace4catsTapir,
       Dependencies.trace4catsHttp4sClient,
       Dependencies.trace4catsHttp4sServer,
       Dependencies.trace4catsTailSamplingCache,

diff --git a/ci-release.sbt b/ci-release.sbt
@@ -3,7 +3,10 @@ ThisBuild / crossScalaVersions := Seq(Dependencies.Versions.scala213, Dependenci
 ThisBuild / githubWorkflowTargetTags ++= Seq("v*")
 ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8", "adopt@1.11")
 
-ThisBuild / githubWorkflowBuildPreamble += WorkflowStep.Sbt(List("scalafmtCheckAll", "scalafmtSbtCheck"))
+ThisBuild / githubWorkflowBuildPreamble += WorkflowStep.Sbt(
+  List("scalafmtCheckAll", "scalafmtSbtCheck"),
+  name = Some("Check formatting")
+)
 
 ThisBuild / githubWorkflowPublishTargetBranches := Seq()
 

diff --git a/docs/components.md b/docs/components.md
@@ -31,15 +31,15 @@ application. Forwards batches of spans onto the Collector over TCP.
 To see the command line options:
 
 ```bash
-docker run -it janstenpickle/trace4cats-agent:0.12.0-RC1
+docker run -it janstenpickle/trace4cats-agent:0.12.0-RC2
 ```
 
 Run in background:
 
 ```bash
 docker run -p7777:7777/udp -d --rm \
   --name trace4cats-agent \
-  janstenpickle/janstenpickle/trace4cats-agent:0.12.0-RC1
+  janstenpickle/janstenpickle/trace4cats-agent:0.12.0-RC2
 ```
 
 ### Agent Kafka
@@ -52,15 +52,15 @@ application. Forwards batches of spans onto a supplied Kafka topic.
 To see the command line options:
 
 ```bash
-docker run -it janstenpickle/trace4cats-agent-kafka:0.12.0-RC1
+docker run -it janstenpickle/trace4cats-agent-kafka:0.12.0-RC2
 ```
 
 Run in background:
 
 ```bash
 docker run -p7777:7777/udp -d --rm \
   --name trace4cats-agent \
-  janstenpickle/janstenpickle/trace4cats-agent-kafka:0.12.0-RC1
+  janstenpickle/janstenpickle/trace4cats-agent-kafka:0.12.0-RC2
 ```
 
 ## Collectors
@@ -200,7 +200,7 @@ new-relic:
 docker run -p7777:7777 -p7777:7777/udp -d --rm \
   --name trace4cats-collector \
   -v /path/to/your/collector-config.yaml:/tmp/collector.yaml \
-  janstenpickle/trace4cats-collector:0.12.0-RC1 --config-file=/tmp/collector.yaml
+  janstenpickle/trace4cats-collector:0.12.0-RC2 --config-file=/tmp/collector.yaml
 ```
 
 
@@ -318,7 +318,7 @@ new-relic:
 docker run -p7777:7777 -p7777:7777/udp -d --rm \
   --name trace4cats-collector-lite \
   -v /path/to/your/collector-config.yaml:/tmp/collector.yaml \
-  janstenpickle/trace4cats-collector-lite:0.12.0-RC1 --config-file=/tmp/collector.yaml
+  janstenpickle/trace4cats-collector-lite:0.12.0-RC2 --config-file=/tmp/collector.yaml
 ```