Skip to content

Commit 57bc4c6

Browse files
committed
Revert "-Yscala-release support: extend community build with basic forward-compat tests (compiling selected projects with "-Yscala-release 3.0")"
This reverts commit e39b618.
1 parent 119e3d7 commit 57bc4c6

File tree

6 files changed

+134
-153
lines changed

6 files changed

+134
-153
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ jobs:
363363
git submodule update --init --recursive --jobs 7
364364
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestC"
365365
366+
<<<<<<< HEAD
366367
- name: Show dependency tracking file
367368
if: ${{ always() }}
368369
run: cat community-build/dotty-community-build-deps || true
@@ -410,6 +411,8 @@ jobs:
410411
git submodule update --init --recursive --jobs 7
411412
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat"
412413
414+
=======
415+
>>>>>>> parent of e39b618f9a (-Yscala-release support: extend community build with basic forward-compat tests (compiling selected projects with "-Yscala-release 3.0"))
413416
test_sbt:
414417
runs-on: [self-hosted, Linux]
415418
container:
@@ -509,7 +512,11 @@ jobs:
509512
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
510513
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
511514
- ${{ github.workspace }}/../../cache/general:/root/.cache
515+
<<<<<<< HEAD
512516
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8]
517+
=======
518+
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
519+
>>>>>>> parent of e39b618f9a (-Yscala-release support: extend community build with basic forward-compat tests (compiling selected projects with "-Yscala-release 3.0"))
513520
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
514521
env:
515522
NIGHTLYBUILD: yes

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ object CommunityBuildRunner:
1717
* for more infrastructural details.
1818
*/
1919
extension (self: CommunityProject) def run()(using suite: CommunityBuildRunner): Unit =
20-
if self.requiresExperimental && !self.compilerSupportExperimental then
20+
if self.requiresExperimental && !compilerSupportExperimental then
2121
log(s"Skipping ${self.project} - it needs experimental features unsupported in this build.")
2222
return
23-
self.dependencies().foreach(_.publish())
23+
self.dependencies.foreach(_.publish())
2424
self.testOnlyDependencies().foreach(_.publish())
2525
suite.runProject(self)
2626

@@ -45,7 +45,6 @@ trait CommunityBuildRunner:
4545
val project = projectDef.project
4646
val command = projectDef.binaryName
4747
val arguments = projectDef.buildCommands
48-
val compilerVersion = projectDef.compilerVersion
4948

5049
@annotation.tailrec
5150
def execTimes(task: () => Int, timesToRerun: Int): Boolean =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ object Main:
5757
val (toRun, ignored) =
5858
allProjects.partition( p =>
5959
p.docCommand != null
60-
&& (!p.requiresExperimental || p.compilerSupportExperimental)
60+
&& (!p.requiresExperimental || compilerSupportExperimental)
6161
)
6262

6363
val paths = toRun.map { project =>

0 commit comments

Comments
 (0)