Skip to content

Commit e717cd2

Browse files
committed
chore: drop the old sbt-test infrastructure
1 parent e39a190 commit e717cd2

File tree

3 files changed

+0
-87
lines changed

3 files changed

+0
-87
lines changed

.github/workflows/ci.yaml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -347,51 +347,6 @@ jobs:
347347
if: ${{ always() }}
348348
run: cat community-build/dotty-community-build-deps || true
349349

350-
test_sbt:
351-
runs-on: [self-hosted, Linux]
352-
container:
353-
image: lampepfl/dotty:2024-10-18
354-
options: --cpu-shares 4096
355-
volumes:
356-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
357-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
358-
- ${{ github.workspace }}/../../cache/general:/root/.cache
359-
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
360-
|| github.event_name == 'push'
361-
|| (
362-
github.event_name == 'pull_request'
363-
&& !contains(github.event.pull_request.body, '[skip ci]')
364-
&& !contains(github.event.pull_request.body, '[skip test_sbt]')
365-
)
366-
|| (
367-
github.event_name == 'workflow_dispatch'
368-
&& github.repository == 'scala/scala3'
369-
)"
370-
371-
steps:
372-
- name: Set JDK 17 as default
373-
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
374-
375-
- name: Reset existing repo
376-
run: |
377-
git config --global --add safe.directory $GITHUB_WORKSPACE
378-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
379-
380-
- name: Checkout cleanup script
381-
uses: actions/checkout@v5
382-
383-
- name: Cleanup
384-
run: .github/workflows/cleanup.sh
385-
386-
- name: Git Checkout
387-
uses: actions/checkout@v5
388-
389-
- name: Add SBT proxy repositories
390-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
391-
392-
- name: Test sbt
393-
run: ./project/scripts/sbt "sbt-test/scripted"
394-
395350
publish_release:
396351
permissions:
397352
contents: write # for GH CLI to create a release

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ val sjsSandbox = Build.sjsSandbox
5454
val sjsJUnitTests = Build.sjsJUnitTests
5555
val sjsCompilerTests = Build.sjsCompilerTests
5656

57-
val `sbt-test` = Build.`sbt-test`
5857
val `sbt-test-new` = Build.`sbt-test-new`
5958

6059
inThisBuild(Build.thisBuildSettings)

project/Build.scala

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3428,47 +3428,6 @@ object Build {
34283428
BuildInfoPlugin.buildInfoScopedSettings(Test),
34293429
)
34303430

3431-
// various scripted sbt tests
3432-
lazy val `sbt-test` = project.in(file("sbt-test")).
3433-
enablePlugins(ScriptedPlugin).
3434-
settings(commonSettings).
3435-
settings(
3436-
sbtTestDirectory := baseDirectory.value,
3437-
target := baseDirectory.value / ".." / "out" / name.value,
3438-
3439-
// The batch mode accidentally became the default with no way to disable
3440-
// it in sbt 1.4 (https://github.com/sbt/sbt/issues/5913#issuecomment-716003195).
3441-
// We enable it explicitly here to make it clear that we're using it.
3442-
scriptedBatchExecution := true,
3443-
3444-
scriptedLaunchOpts ++= Seq(
3445-
"-Dplugin.version=" + version.value,
3446-
"-Dplugin.scalaVersion=" + dottyVersion,
3447-
"-Dplugin.scala2Version=" + stdlibVersion(Bootstrapped),
3448-
"-Dplugin.scalaJSVersion=" + scalaJSVersion,
3449-
"-Dsbt.boot.directory=" + ((ThisBuild / baseDirectory).value / ".sbt-scripted").getAbsolutePath // Workaround sbt/sbt#3469
3450-
),
3451-
// Pass along ivy home and repositories settings to sbt instances run from the tests
3452-
scriptedLaunchOpts ++= {
3453-
val repositoryPath = (io.Path.userHome / ".sbt" / "repositories").absolutePath
3454-
s"-Dsbt.repository.config=$repositoryPath" ::
3455-
ivyPaths.value.ivyHome.map("-Dsbt.ivy.home=" + _.getAbsolutePath).toList
3456-
},
3457-
scriptedBufferLog := true,
3458-
scripted := scripted.dependsOn(
3459-
(`scala3-sbt-bridge` / publishLocalBin),
3460-
(`scala3-interfaces` / publishLocalBin),
3461-
(`scala3-compiler-bootstrapped` / publishLocalBin),
3462-
(`scala3-library-bootstrapped` / publishLocalBin),
3463-
(`scala3-library-bootstrappedJS` / publishLocalBin),
3464-
(`tasty-core-bootstrapped` / publishLocalBin),
3465-
(`scala3-staging` / publishLocalBin),
3466-
(`scala3-tasty-inspector` / publishLocalBin),
3467-
(`scaladoc` / publishLocalBin),
3468-
(`scala3-bootstrapped` / publishLocalBin) // Needed because sbt currently hardcodes the dotty artifact
3469-
).evaluated
3470-
)
3471-
34723431
val prepareCommunityBuild = taskKey[Unit]("Publish local the compiler and the sbt plugin. Also store the versions of the published local artefacts in two files, community-build/{scala3-bootstrapped.version,sbt-injected-plugins}.")
34733432

34743433
lazy val `community-build` = project.in(file("community-build")).

0 commit comments

Comments
 (0)