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.

Sign up for GitHub

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

Clean up ci/package.mill, enforce scalafmt on build.mill/package.mill files in CI, break up readme.adoc #4342

Merged
merged 8 commits into from
Jan 16, 2025
Merged

Clean up ci/package.mill, enforce scalafmt on build.mill/package.mill files in CI, break up readme.adoc #4342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab426a6
.
lihaoyi Jan 16, 2025
38f4b1b
.
lihaoyi Jan 16, 2025
4e4c0ef
.
lihaoyi Jan 16, 2025
dd51aac
.
lihaoyi Jan 16, 2025
9bc68ee
.
lihaoyi Jan 16, 2025
dbc7a66
.
lihaoyi Jan 16, 2025
b50e360
Merge branch 'main' into rm-ci/package
lihaoyi Jan 16, 2025
32b8e16
.
lihaoyi Jan 16, 2025
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
5 changes: 4 additions & 1 deletion .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,7 @@ jobs:
uses: ./.github/workflows/post-build-raw.yml
with:
java-version: '17'
buildcmd: ./mill -i mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll __.sources + __.mimaReportBinaryIssues + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll
buildcmd: |
set -eux
./mill -i mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll + __.mimaReportBinaryIssues + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll
./mill -i --meta-level 1 mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll
14 changes: 8 additions & 6 deletions build.mill
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import mill.define.Cross

// plugins and dependencies
import $meta._
import $file.ci.shared
import $file.ci.upload

import $packages._

object Settings {
Expand Down Expand Up @@ -271,8 +270,7 @@ def millVersion: T[String] = Task.Input {
// Ignore local changes when computing the VCS version string,
// since we make those in CI and can promise they are safe
VcsVersion.calcVcsState(Task.log).copy(dirtyHash = None).format()
}
else "SNAPSHOT"
} else "SNAPSHOT"
}

def millLastTag: T[String] = Task {
Expand Down Expand Up @@ -596,8 +594,12 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima {
),

// Overrides added for new methods, ought to be safe
ProblemFilter.exclude[ReversedMissingMethodProblem]("mill.scalalib.JavaModule.mill$scalalib$JavaModule$$super$internalRepositories"),
ProblemFilter.exclude[ReversedMissingMethodProblem]("mill.scalanativelib.ScalaNativeModule.mill$scalanativelib$ScalaNativeModule$$super$coursierProject"),
ProblemFilter.exclude[ReversedMissingMethodProblem](
"mill.scalalib.JavaModule.mill$scalalib$JavaModule$$super$internalRepositories"
),
ProblemFilter.exclude[ReversedMissingMethodProblem](
"mill.scalanativelib.ScalaNativeModule.mill$scalanativelib$ScalaNativeModule$$super$coursierProject"
),

// https://github.com/com-lihaoyi/mill/pull/3503
ProblemFilter.exclude[ReversedMissingMethodProblem](
Expand Down
2,462 changes: 2,462 additions & 0 deletions changelog.adoc
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion ci/package.mill
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ci/shared.mill
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions ci/upload.mill
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions contrib/package.mill
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import build.Deps

// plugins and dependencies
import $meta._
import $file.ci.shared
import $file.ci.upload

object `package` extends RootModule {
def contribModules: Seq[ContribModule] =
Expand Down Expand Up @@ -115,7 +113,7 @@ object `package` extends RootModule {
def testArgs = Task {
super.testArgs() ++
Seq(
s"-DMILL_SCOVERAGE2_VERSION=${build.Deps.scalacScoverage2Plugin.dep.version}",
s"-DMILL_SCOVERAGE2_VERSION=${build.Deps.scalacScoverage2Plugin.dep.version}"
)
}

Expand Down
Loading
Loading