Skip to content

Commit fd6ac43

Browse files
authored
Merge pull request #14995 from dotty-staging/remove-test-forward-compat
Remove test forward compat
2 parents af34319 + 272621b commit fd6ac43

File tree

17 files changed

+88
-274
lines changed

17 files changed

+88
-274
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -367,49 +367,6 @@ jobs:
367367
if: ${{ always() }}
368368
run: cat community-build/dotty-community-build-deps || true
369369

370-
community_build_forward_compat:
371-
runs-on: [self-hosted, Linux]
372-
container:
373-
image: lampepfl/dotty:2021-03-22
374-
options: --cpu-shares 4096
375-
volumes:
376-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
377-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
378-
- ${{ github.workspace }}/../../cache/general:/root/.cache
379-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
380-
|| (
381-
github.event_name == 'pull_request'
382-
&& !contains(github.event.pull_request.body, '[skip ci]')
383-
&& !contains(github.event.pull_request.body, '[skip community_build]')
384-
&& contains(github.event.pull_request.body, '[test_forward_compat]')
385-
)
386-
|| (
387-
github.event_name == 'workflow_dispatch'
388-
&& github.repository == 'lampepfl/dotty'
389-
)"
390-
391-
steps:
392-
- name: Reset existing repo
393-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
394-
395-
- name: Checkout cleanup script
396-
uses: actions/checkout@v2
397-
398-
- name: Cleanup
399-
run: .github/workflows/cleanup.sh
400-
401-
- name: Git Checkout
402-
uses: actions/checkout@v2
403-
404-
- name: Add SBT proxy repositories
405-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
406-
407-
- name: Test
408-
run: |
409-
git submodule sync
410-
git submodule update --init --recursive --jobs 7
411-
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat"
412-
413370
test_sbt:
414371
runs-on: [self-hosted, Linux]
415372
container:
@@ -509,7 +466,7 @@ jobs:
509466
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
510467
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
511468
- ${{ github.workspace }}/../../cache/general:/root/.cache
512-
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8]
469+
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
513470
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
514471
env:
515472
NIGHTLYBUILD: yes

.gitmodules

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -216,37 +216,6 @@
216216
[submodule "community-build/community-projects/spire"]
217217
path = community-build/community-projects/spire
218218
url = https://github.com/dotty-staging/spire.git
219-
[submodule "community-build/community-projects/munit-forward-compat"]
220-
path = community-build/community-projects/munit-forward-compat
221-
url = https://github.com/dotty-staging/munit.git
222-
[submodule "community-build/community-projects/discipline-forward-compat"]
223-
path = community-build/community-projects/discipline-forward-compat
224-
url = https://github.com/dotty-staging/discipline.git
225-
[submodule "community-build/community-projects/discipline-munit-forward-compat"]
226-
path = community-build/community-projects/discipline-munit-forward-compat
227-
url = https://github.com/dotty-staging/discipline-munit.git
228-
[submodule "community-build/community-projects/discipline-specs2-forward-compat"]
229-
path = community-build/community-projects/discipline-specs2-forward-compat
230-
url = https://github.com/dotty-staging/discipline-specs2.git
231-
[submodule "community-build/community-projects/simulacrum-scalafix-forward-compat"]
232-
path = community-build/community-projects/simulacrum-scalafix-forward-compat
233-
url = https://github.com/dotty-staging/simulacrum-scalafix.git
234-
[submodule "community-build/community-projects/cats-forward-compat"]
235-
path = community-build/community-projects/cats-forward-compat
236-
url = https://github.com/dotty-staging/cats.git
237-
[submodule "community-build/community-projects/cats-mtl-forward-compat"]
238-
path = community-build/community-projects/cats-mtl-forward-compat
239-
url = https://github.com/dotty-staging/cats-mtl.git
240-
[submodule "community-build/community-projects/coop-forward-compat"]
241-
path = community-build/community-projects/coop-forward-compat
242-
url = https://github.com/dotty-staging/coop.git
243-
[submodule "community-build/community-projects/cats-effect-3-forward-compat"]
244-
path = community-build/community-projects/cats-effect-3-forward-compat
245-
url = https://github.com/dotty-staging/cats-effect.git
246-
branch = series/3.x
247-
[submodule "community-build/community-projects/scalacheck-forward-compat"]
248-
path = community-build/community-projects/scalacheck-forward-compat
249-
url = https://github.com/dotty-staging/scalacheck
250219
[submodule "community-build/community-projects/http4s"]
251220
path = community-build/community-projects/http4s
252221
url = https://github.com/dotty-staging/http4s.git
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 1 deletion
This file was deleted.

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)