From cac9c6ed68892b23359b053005604d9f57bf6ba3 Mon Sep 17 00:00:00 2001 From: Mark Probst Date: Thu, 23 Jul 2026 18:40:34 -0400 Subject: [PATCH 1/2] fix(ci): avoid Bloop in Scala fixtures --- .github/workflows/test-pr.yaml | 4 +--- test/fixtures/scala3-upickle/run.sh | 2 +- test/fixtures/scala3/run.sh | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml index 5550acf162..5673405d2f 100644 --- a/.github/workflows/test-pr.yaml +++ b/.github/workflows/test-pr.yaml @@ -195,9 +195,7 @@ jobs: - name: Install scala if: ${{ contains(matrix.fixture, 'scala3') }} - uses: VirtusLab/scala-cli-setup@main - - run: echo '@main def hello() = println("We need this spam print statement for bloop to exit correctly...")' | scala-cli _ - if: ${{ contains(matrix.fixture, 'scala3') }} + uses: VirtusLab/scala-cli-setup@v1.15.0 - name: Install Elixir if: ${{ contains(matrix.fixture, 'elixir') }} diff --git a/test/fixtures/scala3-upickle/run.sh b/test/fixtures/scala3-upickle/run.sh index 7707d38414..7b53265301 100755 --- a/test/fixtures/scala3-upickle/run.sh +++ b/test/fixtures/scala3-upickle/run.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -scala-cli upickle.scala TopLevel.scala +scala-cli run --server=false upickle.scala TopLevel.scala diff --git a/test/fixtures/scala3/run.sh b/test/fixtures/scala3/run.sh index ff6223e387..f965910ba8 100755 --- a/test/fixtures/scala3/run.sh +++ b/test/fixtures/scala3/run.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -scala-cli circe.scala TopLevel.scala +scala-cli run --server=false circe.scala TopLevel.scala From 89d28d451725b8a24de9b2aecd8b166f8448ccb2 Mon Sep 17 00:00:00 2001 From: Mark Probst Date: Thu, 23 Jul 2026 19:54:15 -0400 Subject: [PATCH 2/2] fix(ci): keep Bloop responsive under fixture load --- .github/workflows/test-pr.yaml | 4 ++++ test/fixtures/scala3-upickle/run.sh | 2 +- test/fixtures/scala3/run.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml index 5673405d2f..6cc2ab1f48 100644 --- a/.github/workflows/test-pr.yaml +++ b/.github/workflows/test-pr.yaml @@ -196,6 +196,8 @@ jobs: - name: Install scala if: ${{ contains(matrix.fixture, 'scala3') }} uses: VirtusLab/scala-cli-setup@v1.15.0 + - run: echo '@main def hello() = println("Warm up the Scala compilation server")' | SCALA_CLI_EXTRA_TIMEOUT=2min scala-cli _ + if: ${{ contains(matrix.fixture, 'scala3') }} - name: Install Elixir if: ${{ contains(matrix.fixture, 'elixir') }} @@ -205,6 +207,8 @@ jobs: otp-version: "26.0" - run: QUICKTEST=true FIXTURE=${{ matrix.fixture }} npm run test:fixtures + env: + CPUs: ${{ contains(matrix.fixture, 'scala3') && '2' || '0' }} test-complete: if: ${{ cancelled() || contains(needs.*.result, 'cancelled') || contains(needs.*.result, 'failure') }} diff --git a/test/fixtures/scala3-upickle/run.sh b/test/fixtures/scala3-upickle/run.sh index 7b53265301..34aa69ba6b 100755 --- a/test/fixtures/scala3-upickle/run.sh +++ b/test/fixtures/scala3-upickle/run.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -scala-cli run --server=false upickle.scala TopLevel.scala +SCALA_CLI_EXTRA_TIMEOUT="${SCALA_CLI_EXTRA_TIMEOUT:-2min}" scala-cli run upickle.scala TopLevel.scala diff --git a/test/fixtures/scala3/run.sh b/test/fixtures/scala3/run.sh index f965910ba8..2869cbe170 100755 --- a/test/fixtures/scala3/run.sh +++ b/test/fixtures/scala3/run.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -scala-cli run --server=false circe.scala TopLevel.scala +SCALA_CLI_EXTRA_TIMEOUT="${SCALA_CLI_EXTRA_TIMEOUT:-2min}" scala-cli run circe.scala TopLevel.scala