Skip to content

Commit ecd6f48

Browse files
authored
Merge pull request #4130 from Gedochao/maintenance/dont-install-bloop-separately
Don't install Bloop separately on the CI
2 parents 122c889 + 6ebd2a1 commit ecd6f48

2 files changed

Lines changed: 1 addition & 21 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ jobs:
2727
- uses: VirtusLab/scala-cli-setup@v1
2828
with:
2929
jvm: "temurin:17"
30-
- name: Install Bloop separately
31-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
3230
- name: Copy launcher
3331
run: ./mill -i copyJvmLauncher --directory artifacts/
3432
if: runner.os == 'Linux'
@@ -577,8 +575,6 @@ jobs:
577575
- uses: VirtusLab/scala-cli-setup@v1
578576
with:
579577
jvm: "temurin:17"
580-
- name: Install Bloop separately
581-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
582578
- name: Ensure it's not running on aarch64
583579
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
584580
- name: Generate native launcher
@@ -611,8 +607,6 @@ jobs:
611607
- uses: VirtusLab/scala-cli-setup@v1
612608
with:
613609
jvm: "temurin:17"
614-
- name: Install Bloop separately
615-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
616610
- name: Ensure it's not running on aarch64
617611
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
618612
- uses: actions/download-artifact@v7
@@ -651,8 +645,6 @@ jobs:
651645
- uses: VirtusLab/scala-cli-setup@v1
652646
with:
653647
jvm: "temurin:17"
654-
- name: Install Bloop separately
655-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
656648
- name: Ensure it's not running on aarch64
657649
run: scala-cli -e 'assert(System.getProperty("os.arch") != "aarch64")'
658650
- uses: actions/download-artifact@v7
@@ -690,8 +682,6 @@ jobs:
690682
- uses: VirtusLab/scala-cli-setup@v1
691683
with:
692684
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
693-
- name: Install Bloop separately
694-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
695685
- name: Ensure it's running on aarch64
696686
run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
697687
- name: Generate native launcher
@@ -724,8 +714,6 @@ jobs:
724714
- uses: VirtusLab/scala-cli-setup@v1
725715
with:
726716
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
727-
- name: Install Bloop separately
728-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
729717
- name: Ensure it's running on aarch64
730718
run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
731719
- uses: actions/download-artifact@v7
@@ -764,8 +752,6 @@ jobs:
764752
- uses: VirtusLab/scala-cli-setup@v1
765753
with:
766754
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
767-
- name: Install Bloop separately
768-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
769755
- name: Ensure it's running on aarch64
770756
run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
771757
- uses: actions/download-artifact@v7
@@ -804,8 +790,6 @@ jobs:
804790
- uses: VirtusLab/scala-cli-setup@v1
805791
with:
806792
jvm: "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz"
807-
- name: Install Bloop separately
808-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
809793
- name: Ensure it's running on aarch64
810794
run: scala-cli -e 'assert(System.getProperty("os.arch") == "aarch64")'
811795
- uses: actions/download-artifact@v7
@@ -1252,8 +1236,6 @@ jobs:
12521236
- uses: VirtusLab/scala-cli-setup@v1
12531237
with:
12541238
jvm: "zulu:17"
1255-
- name: Install Bloop separately
1256-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
12571239
- uses: actions/setup-node@v6
12581240
with:
12591241
node-version: 24
@@ -1293,8 +1275,6 @@ jobs:
12931275
run: ./mill -i __.checkNativeImageConfFormat
12941276
- name: Check Ammonite availability
12951277
run: ./mill -i 'dummy.amm[_].resolvedRunMvnDeps'
1296-
- name: Install Bloop separately
1297-
run: cs fetch ch.epfl.scala:bloop-frontend_2.12:2.0.17
12981278
- name: Check for cross Scala version conflicts
12991279
run: .github/scripts/check-cross-version-deps.sc
13001280
- name: Scalafix check

modules/integration/src/test/scala/scala/cli/integration/ReplAmmoniteTestDefinitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ trait ReplAmmoniteTestDefinitions { this: ReplTestDefinitions =>
8484
}
8585

8686
def ammoniteTest(): Unit = {
87-
TestInputs.empty.fromRoot { root =>
87+
TestInputs.empty.fromRoot { _ =>
8888
val code =
8989
if actualScalaVersion.startsWith("3") then
9090
"dotty.tools.dotc.config.Properties.simpleVersionString"

0 commit comments

Comments
 (0)