connect CB with the new artifacts

.github/workflows/ci.yaml

@@ -168,177 +168,6 @@ jobs:
         run: sbt ";scala3-bootstrapped-new/compile ;scala3-compiler-bootstrapped-new/test"
         shell: cmd
 
-  community_build_a:
-    runs-on: [self-hosted, Linux]
-    container:
-      image: lampepfl/dotty:2024-10-18
-      options: --cpu-shares 4096
-      volumes:
-        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
-        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
-        - ${{ github.workspace }}/../../cache/general:/root/.cache
-    if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
-         || github.event_name == 'push'
-         || github.event_name == 'merge_group'
-         || (
-           github.event_name == 'pull_request'
-           && !contains(github.event.pull_request.body, '[skip ci]')
-           && !contains(github.event.pull_request.body, '[skip community_build]')
-           && !contains(github.event.pull_request.body, '[skip community_build_a]')
-         )
-         || (
-           github.event_name == 'workflow_dispatch'
-           && github.repository == 'scala/scala3'
-         )"
-
-    steps:
-      ##############################################################################################
-      ## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
-      ##############################################################################################
-      - name: Set JDK 17 as default
-        run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
-      - name: Reset existing repo
-        run: |
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
-
-      - name: Checkout cleanup script
-        uses: actions/checkout@v5
-
-      - name: Cleanup
-        run: .github/workflows/cleanup.sh
-
-      - name: Git Checkout
-        uses: actions/checkout@v5
-
-      - name: Add SBT proxy repositories
-        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
-
-      - name: Test
-        run: |
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          git submodule sync
-          git submodule update --init --recursive --jobs 7
-          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
-
-      - name: Show dependency tracking file
-        if: ${{ always() }}
-        run: cat community-build/dotty-community-build-deps || true
-
-  community_build_b:
-    runs-on: [self-hosted, Linux]
-    container:
-      image: lampepfl/dotty:2024-10-18
-      options: --cpu-shares 4096
-      volumes:
-        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
-        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
-        - ${{ github.workspace }}/../../cache/general:/root/.cache
-    if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
-         || github.event_name == 'push'
-         || github.event_name == 'merge_group'
-         || (
-           github.event_name == 'pull_request'
-           && !contains(github.event.pull_request.body, '[skip ci]')
-           && !contains(github.event.pull_request.body, '[skip community_build]')
-           && !contains(github.event.pull_request.body, '[skip community_build_b]')
-         )
-         || (
-           github.event_name == 'workflow_dispatch'
-           && github.repository == 'scala/scala3'
-         )"
-
-    steps:
-      ##############################################################################################
-      ## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
-      ##############################################################################################
-      - name: Set JDK 17 as default
-        run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
-      - name: Reset existing repo
-        run: |
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
-
-      - name: Checkout cleanup script
-        uses: actions/checkout@v5
-
-      - name: Cleanup
-        run: .github/workflows/cleanup.sh
-
-      - name: Git Checkout
-        uses: actions/checkout@v5
-
-      - name: Add SBT proxy repositories
-        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
-
-      - name: Test
-        run: |
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          git submodule sync
-          git submodule update --init --recursive --jobs 7
-          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
-
-      - name: Show dependency tracking file
-        if: ${{ always() }}
-        run: cat community-build/dotty-community-build-deps || true
-
-  community_build_c:
-    runs-on: [self-hosted, Linux]
-    container:
-      image: lampepfl/dotty:2024-10-18
-      options: --cpu-shares 4096
-      volumes:
-        - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
-        - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
-        - ${{ github.workspace }}/../../cache/general:/root/.cache
-    if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
-         || github.event_name == 'push'
-         || github.event_name == 'merge_group'
-         || (
-           github.event_name == 'pull_request'
-           && !contains(github.event.pull_request.body, '[skip ci]')
-           && !contains(github.event.pull_request.body, '[skip community_build]')
-           && !contains(github.event.pull_request.body, '[skip community_build_c]')
-         )
-         || (
-           github.event_name == 'workflow_dispatch'
-           && github.repository == 'scala/scala3'
-         )"
-
-    steps:
-      ##############################################################################################
-      ## WARNING: DO NOT CHANGE THE JAVA VERSION HERE. SCALA 3.8.0+ IS DISTRIBUTED USING JAVA 17. ##
-      ##############################################################################################
-      - name: Set JDK 17 as default
-        run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
-      - name: Reset existing repo
-        run: |
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
-
-      - name: Checkout cleanup script
-        uses: actions/checkout@v5
-
-      - name: Cleanup
-        run: .github/workflows/cleanup.sh
-
-      - name: Git Checkout
-        uses: actions/checkout@v5
-
-      - name: Add SBT proxy repositories
-        run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
-
-      - name: Test
-        run: |
-          git config --global --add safe.directory $GITHUB_WORKSPACE
-          git submodule sync
-          git submodule update --init --recursive --jobs 7
-          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
-
-      - name: Show dependency tracking file
-        if: ${{ always() }}
-        run: cat community-build/dotty-community-build-deps || true
-
   publish_release:
     permissions:
       contents: write  # for GH CLI to create a release
@@ -350,9 +179,8 @@ jobs:
         - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
         - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
         - ${{ github.workspace }}/../../cache/general:/root/.cache
-    needs: [test, community_build_a, community_build_b, community_build_c, build-sdk-package, build-msi-package]
-    if: "github.event_name == 'push'
-         && startsWith(github.event.ref, 'refs/tags/')"
+    needs: [test, build-sdk-package, build-msi-package]
+    if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"
 
     env:
       RELEASEBUILD: yes

.github/workflows/stdlib.yaml

@@ -599,3 +599,58 @@ jobs:
       - uses: sbt/setup-sbt@v1
       - name: Run SBT scripted tests
         run: ./project/scripts/sbt scala3-bootstrapped-new/scripted
+
+  community_build_a:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout cleanup script
+        uses: actions/checkout@v5
+        with:
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+      - name: Run Community Build A
+        run: |
+          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
+
+  community_build_b:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout cleanup script
+        uses: actions/checkout@v5
+        with:
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+      - name: Run Community Build B
+        run: |
+          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
+
+
+  community_build_c:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout cleanup script
+        uses: actions/checkout@v5
+        with:
+          submodules: true
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: 17
+          cache: 'sbt'
+      - uses: sbt/setup-sbt@v1
+      - name: Run Community Build C
+        run: |
+          ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"

.gitmodules

@@ -39,7 +39,7 @@
 	url = https://github.com/dotty-staging/intent
 [submodule "community-build/community-projects/utest"]
 	path = community-build/community-projects/utest
-	url = https://github.com/dotty-staging/utest.git
+	url = https://github.com/dotty-staging/utest-new.git
 [submodule "community-build/community-projects/os-lib"]
 	path = community-build/community-projects/os-lib
 	url = https://github.com/dotty-staging/os-lib.git
@@ -90,9 +90,9 @@
 [submodule "community-build/community-projects/PPrint"]
 	path = community-build/community-projects/PPrint
 	url = https://github.com/dotty-staging/PPrint.git
-[submodule "community-build/community-projects/requests-scala"]
-	path = community-build/community-projects/requests-scala
-	url = https://github.com/dotty-staging/requests-scala.git
+[submodule "community-build/community-projects/requests"]
+	path = community-build/community-projects/requests
+	url = https://github.com/dotty-staging/requests.git
 [submodule "community-build/community-projects/cats-effect-3"]
 	path = community-build/community-projects/cats-effect-3
 	url = https://github.com/dotty-staging/cats-effect.git

community-build/src/scala/dotty/communitybuild/projects.scala

@@ -66,15 +66,17 @@ end CommunityProject
 final case class MillCommunityProject(
     project: String,
     baseCommand: String,
-    ignoreDocs: Boolean = false
+    ignoreDocs: Boolean = false,
+    sourcecodeTestCommand: Boolean = false,
     ) extends CommunityProject:
   override val binaryName: String = "./mill"
-  override val testCommand = s"$baseCommand.test"
+  override val testCommand = if sourcecodeTestCommand then s"$baseCommand.test.run" else s"$baseCommand.test"
   override val publishCommand = s"$baseCommand.publishLocal"
   override val docCommand = null
     // uncomment once mill is released
     // if ignoreDocs then null else s"$baseCommand.docJar"
   override val runCommandsArgs = List("-i", "-D", s"dottyVersion=$compilerVersion")
+  override val environment = Map.empty
 
 final case class SbtCommunityProject(
     project: String,
@@ -145,7 +147,8 @@ object projects:
   lazy val sourcecode = MillCommunityProject(
     project = "sourcecode",
     baseCommand = s"sourcecode.jvm[$compilerVersion]",
-    ignoreDocs = true
+    ignoreDocs = true,
+    sourcecodeTestCommand = true,
   )
 
   lazy val oslib = MillCommunityProject(
@@ -202,8 +205,8 @@ object projects:
   )
 
   lazy val requests = MillCommunityProject(
-    project = "requests-scala",
-    baseCommand = s"requests[$compilerVersion]",
+    project = "requests",
+    baseCommand = s"requests.jvm[$compilerVersion]",
   )
 
   lazy val cask = MillCommunityProject(

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -18,7 +18,7 @@ given testRunner: CommunityBuildRunner with
 class CommunityBuildTestA:
   @Test def izumiReflect = projects.izumiReflect.run()
   @Test def scalaSTM = projects.scalaSTM.run()
-  @Test def scalatest = projects.scalatest.run()
+  //@Test def scalatest = projects.scalatest.run()
   @Test def scalatestplusTestNG = projects.scalatestplusTestNG.run()
   // 'Sciss/Lucre' dependencies:
   // @Test def scissEqual      = projects.scissEqual     .run()

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -336,7 +336,7 @@ object desugar {
         case Some(param) if param.mods.isOneOf(GivenOrImplicit) =>
           param.mods.flags & GivenOrImplicit
         case _ =>
-          if Feature.sourceVersion.isAtLeast(`3.6`) then Given
+          if Feature.sourceVersion.isAtLeast(`3.6`) && !Feature.sourceVersion.isScala2 then Given
           else Implicit
       val flags = if isPrimaryConstructor then iflag | LocalParamAccessor else iflag | Param
       mapParamss(paramss) {