diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ac2080cb80..ecc8b4ea33 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -16,17 +16,13 @@ jobs: strategy: matrix: java: [ '11', '21' ] - name: Tests for Java ${{ matrix.Java }} + name: Tests for Java ${{ matrix.java }} steps: - uses: actions/checkout@v3 - - name: Setup java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} - name: Run tests run: | set -eux + sed -i 's#//| mill-jvm-version: 11#//| mill-jvm-version: ${{ matrix.java }}#' build.mill if [ "${{ matrix.java }}" == "21" ]; then JAVA_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED -Dcask.virtual-threads.enabled=true' ./mill -i -k -j1 --disable-ticker __.testForked else @@ -38,23 +34,20 @@ jobs: strategy: matrix: java: [ '11', '21' ] - name: Tests examples for Java ${{ matrix.Java }} + name: Tests examples for Java ${{ matrix.java }} steps: - uses: actions/checkout@v3 - - name: Setup java - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: ${{ matrix.java }} + - name: Run tests run: | set -eux - if [ "${{ matrix.java }}" == "21" ]; then - ./mill __.publishLocal - JAVA_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED -Dcask.virtual-threads.enabled=true' ./mill -i -k -j1 --disable-ticker testExamples - else - ./mill __.publishLocal - ./mill -i -k -j1 --disable-ticker testExamples + sed -i 's#//| mill-jvm-version: 11#//| mill-jvm-version: ${{ matrix.java }}#' build.mill + if [ "${{ matrix.java }}" == "21" ]; then + ./mill __.publishLocal + JAVA_OPTS='--add-opens java.base/java.lang=ALL-UNNAMED -Dcask.virtual-threads.enabled=true' ./mill -i -k -j1 --disable-ticker testExamples + else + ./mill __.publishLocal + ./mill -i -k -j1 --disable-ticker testExamples fi publish-sonatype: @@ -71,11 +64,6 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - - name: Publish to Maven Central run: ./mill -i mill.scalalib.SonatypeCentralPublishModule/ @@ -90,10 +78,6 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - name: Generate Website run: | cd docs diff --git a/.mill-version b/.mill-version deleted file mode 100644 index af0b7ddbff..0000000000 --- a/.mill-version +++ /dev/null @@ -1 +0,0 @@ -1.0.6 diff --git a/build.mill b/build.mill index 8f4836d07f..9f23f0f8ef 100644 --- a/build.mill +++ b/build.mill @@ -1,3 +1,5 @@ +//| mill-version: 1.1.0-RC1 +//| mill-jvm-version: 11 //| mvnDeps: //| - com.github.lolgab::mill-mima_mill1:0.2.0 //| - "com.lihaoyi::mill-contrib-twirllib:$MILL_VERSION" @@ -233,7 +235,7 @@ def zippedExamples = Task { val f = Task.ctx().dest val last = example.last os.copy(example, f / last) - os.copy(mill.api.BuildCtx.workspaceRoot / ".mill-version", f / last / ".mill-version") + os.write( f / last / ".mill-version", mill.constants.BuildInfo.millVersion) os.write.over(f / last / "mill", os.read(mill.api.BuildCtx.workspaceRoot / "mill")) os.proc("chmod", "+x", f / last / "mill").call(f / last) os.move(f / last / "package.mill", f / last / "build.mill")