diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1c670f0..73f5d4bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,9 +9,9 @@ name: Continuous Integration on: pull_request: - branches: ['**', '!update/**', '!pr/**'] + branches: ["**", "!update/**", "!pr/**"] push: - branches: ['**', '!update/**', '!pr/**'] + branches: ["**", "!update/**", "!pr/**"] tags: [v*] env: @@ -31,7 +31,22 @@ jobs: os: [ubuntu-latest] scala: [2.12.19, 2.13.14] java: [temurin@8] - spark: [2.4.1, 2.4.7, 2.4.8, 3.0.1, 3.0.3, 3.1.1, 3.1.2, 3.1.3, 3.2.4, 3.3.4, 3.4.1, 3.4.3, 3.5.1] + spark: + [ + 2.4.1, + 2.4.7, + 2.4.8, + 3.0.1, + 3.0.3, + 3.1.1, + 3.1.2, + 3.1.3, + 3.2.4, + 3.3.4, + 3.4.1, + 3.4.3, + 3.5.1, + ] exclude: - spark: 2.4.1 scala: 2.13.14 @@ -148,4 +163,4 @@ jobs: with: mill-version: 0.11.8 - name: Publish - run: mill -i io.kipp.mill.ci.release.ReleaseModule/publishAll + run: mill -i mill.contrib.sonatypecentral.SonatypeCentralPublishModule/publishAll --publishArtifacts __.publishArtifacts --shouldRelease true --bundleName com.crealytics.spark-excel-$(./mill show build.publishVersion | tr -d '"') diff --git a/build.sc b/build.sc index 8be2b4df..6f28dea8 100644 --- a/build.sc +++ b/build.sc @@ -1,10 +1,16 @@ +import $ivy.`com.lihaoyi::mill-contrib-sonatypecentral:` +import mill.contrib.sonatypecentral.SonatypeCentralPublishModule import $ivy.`io.chris-kipp::mill-ci-release::0.1.10` import io.kipp.mill.ci.release.CiReleaseModule import coursier.maven.MavenRepository import mill._, scalalib._, publish._ import Assembly._ -trait SparkModule extends Cross.Module2[String, String] with SbtModule with CiReleaseModule { +trait SparkModule + extends Cross.Module2[String, String] + with SbtModule + with CiReleaseModule + with SonatypeCentralPublishModule { outer => override def scalaVersion = crossValue val sparkVersion = crossValue2