forked from scala-steward-org/scala-steward
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
``` git rebase --strategy-option theirs scala-steward-org/main ```
- Loading branch information
1 parent
f20d2a4
commit e906ada
Showing
8 changed files
with
80 additions
and
418 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
-Xms4096m | ||
-Xmx4096m | ||
-Xss6m |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,8 +12,8 @@ val projectName = "scala-steward" | |
val rootPkg = groupId.replace("-", "") | ||
val gitHubOwner = "scala-steward-org" | ||
val gitHubUrl = s"https://github.com/$gitHubOwner/$projectName" | ||
val mainBranch = "main" | ||
val gitHubUserContent = s"https://raw.githubusercontent.com/$gitHubOwner/$projectName/$mainBranch" | ||
val mainBranch = "master" | ||
val gitHubUserContent = s"https://raw.githubusercontent.com/scala-steward-bot/scala-steward/cron" | ||
|
||
val moduleCrossPlatformMatrix: Map[String, List[Platform]] = Map( | ||
"benchmark" -> List(JVMPlatform), | ||
|
@@ -299,6 +299,7 @@ def myCrossProject(name: String): CrossProject = | |
lazy val commonSettings = Def.settings( | ||
compileSettings, | ||
metadataSettings, | ||
scalacOptions -= "-Xfatal-warnings", | ||
scaladocSettings | ||
) | ||
|
||
|
@@ -442,18 +443,12 @@ runSteward := Def.taskDyn { | |
val args = Seq( | ||
Seq("--workspace", s"$projectDir/workspace"), | ||
Seq("--repos-file", s"$projectDir/repos.md"), | ||
Seq("--git-author-email", s"dev@$projectName.org"), | ||
Seq("--forge-login", gitHubLogin), | ||
Seq("--git-ask-pass", s"$home/.github/askpass/$gitHubLogin.sh"), | ||
// Seq("--github-app-id", IO.read(gitHubAppDir / "scala-steward.app-id.txt").trim), | ||
// Seq("--github-app-key-file", s"$gitHubAppDir/scala-steward.private-key.pem"), | ||
Seq("--whitelist", s"$home/.cache/coursier"), | ||
Seq("--whitelist", s"$home/.cache/JNA"), | ||
Seq("--whitelist", s"$home/.cache/mill"), | ||
Seq("--whitelist", s"$home/.ivy2"), | ||
Seq("--whitelist", s"$home/.m2"), | ||
Seq("--whitelist", s"$home/.mill"), | ||
Seq("--whitelist", s"$home/.sbt") | ||
Seq("--git-author-email", "[email protected]"), | ||
Seq("--forge-login", "scala-steward-bot"), | ||
Seq("--git-ask-pass", s"$projectDir/git_ask_pass.sh"), | ||
Seq("--disable-sandbox"), | ||
Seq("--github-app-id", "89853"), | ||
Seq("--github-app-key-file", s"$projectDir/key.pem") | ||
).flatten.mkString(" ", " ", "") | ||
(core.jvm / Compile / run).toTask(args) | ||
}.value | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
echo ${GITHUB_TOKEN} |
Oops, something went wrong.