From 7ff541d4c742d316c93ac583fd0f4ad6d34de92e Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Fri, 13 Feb 2026 14:31:38 +0100 Subject: [PATCH 1/3] Revert "chore: Install Bloop separately" This reverts commit 2bb1d720f691a7a7d02a35aab451ffe52440d3af. --- .github/workflows/ci.yml | 16 ---------------- .../cli/commands/pgp/PgpExternalCommand.scala | 2 ++ .../scala/scala/cli/internal/ScalaJsLinker.scala | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99eb8f5963..0bef994398 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "temurin:17" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Copy launcher run: ./mill -i copyJvmLauncher --directory artifacts/ if: runner.os == 'Linux' @@ -577,8 +575,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "temurin:17" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Ensure it's not running on aarch64 run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")' - name: Generate native launcher @@ -611,8 +607,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "temurin:17" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Ensure it's not running on aarch64 run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")' - uses: actions/download-artifact@v7 @@ -651,8 +645,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "temurin:17" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Ensure it's not running on aarch64 run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")' - uses: actions/download-artifact@v7 @@ -690,8 +682,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Ensure it's running on aarch64 run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")' - name: Generate native launcher @@ -724,8 +714,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Ensure it's running on aarch64 run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")' - uses: actions/download-artifact@v7 @@ -1252,8 +1240,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "zulu:17" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - uses: actions/setup-node@v6 with: node-version: 24 @@ -1293,8 +1279,6 @@ jobs: run: ./mill -i __.checkNativeImageConfFormat - name: Check Ammonite availability run: ./mill -i 'dummy.amm[_].resolvedRunMvnDeps' - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Check for cross Scala version conflicts run: .github/scripts/check-cross-version-deps.sc - name: Scalafix check diff --git a/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala b/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala index 0825ea6d36..a298c31488 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala @@ -1,4 +1,6 @@ package scala.cli.commands.pgp + +import coursier.Repositories import coursier.cache.{ArchiveCache, FileCache} import coursier.util.Task import dependency.* diff --git a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala index c39a77d427..a12465d126 100644 --- a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala +++ b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala @@ -1,8 +1,8 @@ package scala.cli.internal -import coursier.VersionConstraint import coursier.cache.{ArchiveCache, FileCache} import coursier.util.Task +import coursier.{Repositories, VersionConstraint} import dependency.* import org.scalajs.testing.adapter.TestAdapterInitializer as TAI From 658141f90a9b921d77f38a66c77732bfaad86e2e Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Fri, 13 Feb 2026 14:33:32 +0100 Subject: [PATCH 2/3] Revert "chore: Update the rest of the hanging jobs" This reverts commit 927b464d --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bef994398..765a4ef155 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -752,8 +752,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Ensure it's running on aarch64 run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")' - uses: actions/download-artifact@v7 @@ -792,8 +790,6 @@ jobs: - uses: VirtusLab/scala-cli-setup@v1 with: jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz" - - name: Install Bloop separately - run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17 - name: Ensure it's running on aarch64 run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")' - uses: actions/download-artifact@v7 From 6ebd2a17b71e4d1228e141a0e42bfdcbbf8149d5 Mon Sep 17 00:00:00 2001 From: Piotr Chabelski Date: Fri, 13 Feb 2026 14:58:49 +0100 Subject: [PATCH 3/3] NIT scalafix --- .../main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala | 2 -- .../cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala | 2 +- .../scala/cli/integration/ReplAmmoniteTestDefinitions.scala | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala b/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala index a298c31488..0825ea6d36 100644 --- a/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala +++ b/modules/cli/src/main/scala/scala/cli/commands/pgp/PgpExternalCommand.scala @@ -1,6 +1,4 @@ package scala.cli.commands.pgp - -import coursier.Repositories import coursier.cache.{ArchiveCache, FileCache} import coursier.util.Task import dependency.* diff --git a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala index a12465d126..c39a77d427 100644 --- a/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala +++ b/modules/cli/src/main/scala/scala/cli/internal/ScalaJsLinker.scala @@ -1,8 +1,8 @@ package scala.cli.internal +import coursier.VersionConstraint import coursier.cache.{ArchiveCache, FileCache} import coursier.util.Task -import coursier.{Repositories, VersionConstraint} import dependency.* import org.scalajs.testing.adapter.TestAdapterInitializer as TAI diff --git a/modules/integration/src/test/scala/scala/cli/integration/ReplAmmoniteTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/ReplAmmoniteTestDefinitions.scala index b48394feaf..724fda8116 100644 --- a/modules/integration/src/test/scala/scala/cli/integration/ReplAmmoniteTestDefinitions.scala +++ b/modules/integration/src/test/scala/scala/cli/integration/ReplAmmoniteTestDefinitions.scala @@ -84,7 +84,7 @@ trait ReplAmmoniteTestDefinitions { this: ReplTestDefinitions => } def ammoniteTest(): Unit = { - TestInputs.empty.fromRoot { root => + TestInputs.empty.fromRoot { _ => val code = if actualScalaVersion.startsWith("3") then "dotty.tools.dotc.config.Properties.simpleVersionString"