From 373013671db03f594b41bdce3321f76f813c5992 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Mon, 18 Aug 2025 09:43:50 +0200 Subject: [PATCH 1/5] Update Mill to 0.12.15 --- .github/workflows/build.yml | 4 ++-- .mill-version | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20b6766..edcbeb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - java-version: [8, 11, 17] + java-version: [11, 17] runs-on: ${{ matrix.os }} # continue-on-error: ${{ matrix.os == 'windows-latest' }} @@ -66,7 +66,7 @@ jobs: gpg --list-secret-keys --keyid-format LONG - name: Publish to Maven Central - run: MILL_VERSION="0.12.14" ./millw -i --import "ivy:com.lihaoyi::mill-contrib-sonatypecentral:" mill.contrib.sonatypecentral.SonatypeCentralPublishModule/publishAll --publishArtifacts __.publishArtifacts + run: ./millw -i --import "ivy:com.lihaoyi::mill-contrib-sonatypecentral:" mill.contrib.sonatypecentral.SonatypeCentralPublishModule/publishAll --publishArtifacts __.publishArtifacts env: MILL_PGP_PASSPHRASE: ${{ secrets.GPG_SECRET_KEY_PASS }} # MILL_PGP_SECRET_BASE64: ${{ secrets.GPG_SECRET_KEY }} diff --git a/.mill-version b/.mill-version index 44ab23e..79d099b 100644 --- a/.mill-version +++ b/.mill-version @@ -1 +1 @@ -0.11.13 +0.12.15 From cfd235f0d1559aa04bb516680310183df037af2b Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Mon, 18 Aug 2025 09:54:18 +0200 Subject: [PATCH 2/5] fix publishLocal invocation --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index edcbeb3..5ca65ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,7 @@ jobs: - run: ./millw -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal testRepo if: matrix.os != 'windows-latest' - - run: .\millw.bat -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal testRepo + - run: .\millw.bat -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal --localIvyRepo testRepo if: matrix.os == 'windows-latest' - name: Upload scoverage reports to codecov.io From 15763d6c30ad43dfe3853950c53a6e028c69db76 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Mon, 18 Aug 2025 10:21:35 +0200 Subject: [PATCH 3/5] Fix deprecations --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index e29f82e..0989c06 100644 --- a/build.sc +++ b/build.sc @@ -80,7 +80,7 @@ trait IntegrationtestCross extends CrossScalaModule with PublishModule with Scov override def scoverageVersion = Deps.scoverageVersion - object test extends ScalaModuleTests with ScoverageTests with TestModule.ScalaTest { + object test extends ScalaTests with ScoverageTests with TestModule.ScalaTest { override def ivyDeps = Agg( ivy"org.scalatest::scalatest:3.2.19", ivy"org.scalatestplus::scalacheck-1-16:3.2.14.0" From 115995cec25cb0427ddf7572c128651515b2ca82 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Mon, 18 Aug 2025 12:39:25 +0200 Subject: [PATCH 4/5] Also fix Windows CI run script --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ca65ba..0bb147f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: java-version: ${{ matrix.java-version }} distribution: temurin - - run: ./millw -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal testRepo + - run: ./millw -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal --localIvyRepo testRepo if: matrix.os != 'windows-latest' - run: .\millw.bat -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal --localIvyRepo testRepo if: matrix.os == 'windows-latest' From 6050cda189e9901da91d0edf01d102dc9a8dce2f Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Mon, 18 Aug 2025 12:40:50 +0200 Subject: [PATCH 5/5] Don't run tests in parallel (avoid rt.jar installation race in older Mill versions) --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0bb147f..3f2c023 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,9 +32,9 @@ jobs: java-version: ${{ matrix.java-version }} distribution: temurin - - run: ./millw -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal --localIvyRepo testRepo + - run: ./millw -i -k -d -j 0 __.testCached + __.scoverage.xmlReport + __.publishLocal --localIvyRepo testRepo if: matrix.os != 'windows-latest' - - run: .\millw.bat -i -k -d __.testCached + __.scoverage.xmlReport + __.publishLocal --localIvyRepo testRepo + - run: .\millw.bat -i -k -d -j 0 __.testCached + __.scoverage.xmlReport + __.publishLocal --localIvyRepo testRepo if: matrix.os == 'windows-latest' - name: Upload scoverage reports to codecov.io