-
Notifications
You must be signed in to change notification settings - Fork 24
Add sbt-typelevel-mergify for Automated PR Merging #639
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
Conversation
|
It looks like the build config for this repo was far enough out of date that we need to upgrade some things before GHA will run our jobs. Sorry about that! I merged an update to sbt-typelevel that I think will trigger Scala Steward to propose yet another update to sbt-typelevel that I think will get the build going again. (There may be some other changes needed to make the forthcoming PR mergable too, but I'll work through those.) Once that's merged, I'll let you know, and then you can do the needful to adapt this PR so it can be merged as well. I'll post here once that's merged so you don't have to keep checking back. 🙂 |
|
Ok, I think the build is working again. Can you please update this PR accordingly? Thanks! |
|
Yeah sure @bpholt will look into this |
77e8dac to
1718d9c
Compare
|
[error] sbt.librarymanagement.ResolveException: Error downloading org.typelevel:kind-projector_2.12.20:0.13.2 please review this getting this error help to resolve @bpholt |
Using Coursier's $ cs complete-dep org.typelevel:kind-projector_2.12.20:
0.13.3So Can you try rebasing your changes on top of the latest commits on |
project/plugins.sbt
Outdated
| addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") | ||
| addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.7.7") | ||
| addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0") | ||
| addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.22") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't want to downgrade these dependencies. I think they were added as updates originally, but since I merged several PRs to fix the build, these versions are no longer up to date. You should probably be able to leave this file alone, except to add
addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.7")|
Hii @bpholt please review this again thanks for you guidance :) |
|
Hii @bpholt this is a gentle reminder to review 😊 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like this downgrades the sbt version; is that necessary?
| addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") | ||
| addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2") | ||
| addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.7") | ||
| addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.16") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm surprised to see sbt-scala-native added in this PR. Is it necessary?
| addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.3.1") | ||
| addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3") | ||
| addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2") | ||
| addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.7") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a nitpick, but if you need to modify this file anyway to remove sbt-scala-native, could you please move this line up so it's immediately under the sbt-typelevel reference above? In other words, make this line the new line 3. That will keep the sbt-typelevel* dependencies together, which hopefully will be easier to read and help reduce future merge conflicts.
| pull_request_rules: | ||
| - name: merge scala-steward's PRs | ||
| conditions: | ||
| - author=scala-steward |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, I forgot that we need some additional configuration to override this PR author setting. Could you please add these sbt settings to this project's build.sbt. Once this is done, you can confirm that the generated YAML config looks similar to this.
Description
This PR adds the sbt-typelevel-mergify plugin to the build to assist with project maintenance. With this change, Mergify can automatically merge Scala Steward PRs once they are approved by a maintainer.
Changes Made
Added the correct version of sbt-typelevel-mergify to plugins.sbt.
Resolved dependency conflicts related to sbt-typelevel-mergify.
Successfully generated the .mergify.yml configuration file using mergifyGenerate.
Verified that the generated configuration aligns with project requirements.
Impact
Automates the merging process for Scala Steward PRs, reducing manual effort.
Ensures a smoother dependency update process by leveraging Mergify.
Improves project maintainability and efficiency.
Testing
Ran mergifyGenerate to verify that the .mergify.yml file was correctly generated.
Checked that all dependencies resolve correctly without build errors.
Ensured that Mergify rules align with the project's contribution workflow.
Additional Notes
This enhancement will streamline dependency management and improve the project's overall maintenance workflow. 🚀