Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add sbt-typelevel-mergify #701

Merged
merged 1 commit into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/workflows/build.yml

This file was deleted.

56 changes: 28 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.17, 2.13.10, 3.2.1]
scala: [2.12, 2.13, 3]
java: [temurin@8]
project: [rootJS, rootJVM, rootNative]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -151,92 +151,92 @@ jobs:
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Download target directories (2.12.17, rootJS)
- name: Download target directories (2.12, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJS

- name: Inflate target directories (2.12.17, rootJS)
- name: Inflate target directories (2.12, rootJS)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.17, rootJVM)
- name: Download target directories (2.12, rootJVM)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootJVM

- name: Inflate target directories (2.12.17, rootJVM)
- name: Inflate target directories (2.12, rootJVM)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.12.17, rootNative)
- name: Download target directories (2.12, rootNative)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.17-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12-rootNative

- name: Inflate target directories (2.12.17, rootNative)
- name: Inflate target directories (2.12, rootNative)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.13.10, rootJS)
- name: Download target directories (2.13, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJS

- name: Inflate target directories (2.13.10, rootJS)
- name: Inflate target directories (2.13, rootJS)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.13.10, rootJVM)
- name: Download target directories (2.13, rootJVM)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootJVM

- name: Inflate target directories (2.13.10, rootJVM)
- name: Inflate target directories (2.13, rootJVM)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.13.10, rootNative)
- name: Download target directories (2.13, rootNative)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13.10-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-2.13-rootNative

- name: Inflate target directories (2.13.10, rootNative)
- name: Inflate target directories (2.13, rootNative)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.2.1, rootJS)
- name: Download target directories (3, rootJS)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootJS
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJS

- name: Inflate target directories (3.2.1, rootJS)
- name: Inflate target directories (3, rootJS)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.2.1, rootJVM)
- name: Download target directories (3, rootJVM)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootJVM
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootJVM

- name: Inflate target directories (3.2.1, rootJVM)
- name: Inflate target directories (3, rootJVM)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (3.2.1, rootNative)
- name: Download target directories (3, rootNative)
uses: actions/download-artifact@v2
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-3.2.1-rootNative
name: target-${{ matrix.os }}-${{ matrix.java }}-3-rootNative

- name: Inflate target directories (3.2.1, rootNative)
- name: Inflate target directories (3, rootNative)
run: |
tar xf targets.tar
rm targets.tar
Expand Down
181 changes: 173 additions & 8 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,175 @@
# This file was automatically generated by sbt-typelevel-mergify using the
# mergifyGenerate task. You should add and commit this file to
# your git repository. It goes without saying that you shouldn't edit
# this file by hand! Instead, if you wish to make changes, you should
# change your sbt build configuration to revise the mergify configuration
# to meet your needs, then regenerate this file.

pull_request_rules:
- name: automatically merge scala-steward's PRs
conditions:
- author=scala-steward
- body~=labels:.*semver-patch.*
- status-success=build
actions:
merge:
method: merge
- name: merge scala-steward's PRs
conditions:
- author=scala-steward
- body~=labels:.*early-semver-patch
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJS)
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootJVM)
- status-success=Build and Test (ubuntu-latest, 2.12, temurin@8, rootNative)
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJS)
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootJVM)
- status-success=Build and Test (ubuntu-latest, 2.13, temurin@8, rootNative)
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJS)
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootJVM)
- status-success=Build and Test (ubuntu-latest, 3, temurin@8, rootNative)
actions:
merge: {}
- name: Label core PRs
conditions:
- files~=^modules/core/
actions:
label:
add:
- core
remove: []
- name: Label datadog PRs
conditions:
- files~=^modules/datadog/
actions:
label:
add:
- datadog
remove: []
- name: Label docs PRs
conditions:
- files~=^modules/docs/
actions:
label:
add:
- docs
remove: []
- name: Label examples PRs
conditions:
- files~=^modules/examples/
actions:
label:
add:
- examples
remove: []
- name: Label honeycomb PRs
conditions:
- files~=^modules/honeycomb/
actions:
label:
add:
- honeycomb
remove: []
- name: Label jaeger PRs
conditions:
- files~=^modules/jaeger/
actions:
label:
add:
- jaeger
remove: []
- name: Label lightstep PRs
conditions:
- files~=^modules/lightstep/
actions:
label:
add:
- lightstep
remove: []
- name: Label lightstep-grpc PRs
conditions:
- files~=^modules/lightstep-grpc/
actions:
label:
add:
- lightstep-grpc
remove: []
- name: Label lightstep-http PRs
conditions:
- files~=^modules/lightstep-http/
actions:
label:
add:
- lightstep-http
remove: []
- name: Label log PRs
conditions:
- files~=^modules/log/
actions:
label:
add:
- log
remove: []
- name: Label log-odin PRs
conditions:
- files~=^modules/log-odin/
actions:
label:
add:
- log-odin
remove: []
- name: Label mock PRs
conditions:
- files~=^modules/mock/
actions:
label:
add:
- mock
remove: []
- name: Label mtl PRs
conditions:
- files~=^modules/mtl/
actions:
label:
add:
- mtl
remove: []
- name: Label newrelic PRs
conditions:
- files~=^modules/newrelic/
actions:
label:
add:
- newrelic
remove: []
- name: Label noop PRs
conditions:
- files~=^modules/noop/
actions:
label:
add:
- noop
remove: []
- name: Label opencensus PRs
conditions:
- files~=^modules/opencensus/
actions:
label:
add:
- opencensus
remove: []
- name: Label opentelemetry PRs
conditions:
- files~=^modules/opentelemetry/
actions:
label:
add:
- opentelemetry
remove: []
- name: Label opentracing PRs
conditions:
- files~=^modules/opentracing/
actions:
label:
add:
- opentracing
remove: []
- name: Label xray PRs
conditions:
- files~=^modules/xray/
actions:
label:
add:
- xray
remove: []
1 change: 1 addition & 0 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ lazy val commonNativeSettings = Seq(
// Compilation
ThisBuild / scalaVersion := scala213Version
ThisBuild / crossScalaVersions := Seq(scala212Version, scala213Version, scala30Version)
ThisBuild / githubWorkflowScalaVersions := Seq("2.12", "2.13", "3")

lazy val root = tlCrossRootProject.aggregate(
core,
Expand Down
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.17")
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.4.17")
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.3")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
Expand Down