Skip to content

Remove test forward compat #14995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 1 addition & 44 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -367,49 +367,6 @@ jobs:
if: ${{ always() }}
run: cat community-build/dotty-community-build-deps || true

community_build_forward_compat:
runs-on: [self-hosted, Linux]
container:
image: lampepfl/dotty:2021-03-22
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 == 'lampepfl/dotty'
|| (
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, '[test_forward_compat]')
)
|| (
github.event_name == 'workflow_dispatch'
&& github.repository == 'lampepfl/dotty'
)"

steps:
- name: Reset existing repo
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true

- name: Checkout cleanup script
uses: actions/checkout@v2

- name: Cleanup
run: .github/workflows/cleanup.sh

- name: Git Checkout
uses: actions/checkout@v2

- name: Add SBT proxy repositories
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true

- name: Test
run: |
git submodule sync
git submodule update --init --recursive --jobs 7
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestForwardCompat"

test_sbt:
runs-on: [self-hosted, Linux]
container:
Expand Down Expand Up @@ -509,7 +466,7 @@ jobs:
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
- ${{ github.workspace }}/../../cache/general:/root/.cache
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, community_build_forward_compat, test_sbt, test_java8]
needs: [test_non_bootstrapped, test, mima, community_build_a, community_build_b, community_build_c, test_sbt, test_java8]
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
env:
NIGHTLYBUILD: yes
Expand Down
31 changes: 0 additions & 31 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -216,37 +216,6 @@
[submodule "community-build/community-projects/spire"]
path = community-build/community-projects/spire
url = https://github.com/dotty-staging/spire.git
[submodule "community-build/community-projects/munit-forward-compat"]
path = community-build/community-projects/munit-forward-compat
url = https://github.com/dotty-staging/munit.git
[submodule "community-build/community-projects/discipline-forward-compat"]
path = community-build/community-projects/discipline-forward-compat
url = https://github.com/dotty-staging/discipline.git
[submodule "community-build/community-projects/discipline-munit-forward-compat"]
path = community-build/community-projects/discipline-munit-forward-compat
url = https://github.com/dotty-staging/discipline-munit.git
[submodule "community-build/community-projects/discipline-specs2-forward-compat"]
path = community-build/community-projects/discipline-specs2-forward-compat
url = https://github.com/dotty-staging/discipline-specs2.git
[submodule "community-build/community-projects/simulacrum-scalafix-forward-compat"]
path = community-build/community-projects/simulacrum-scalafix-forward-compat
url = https://github.com/dotty-staging/simulacrum-scalafix.git
[submodule "community-build/community-projects/cats-forward-compat"]
path = community-build/community-projects/cats-forward-compat
url = https://github.com/dotty-staging/cats.git
[submodule "community-build/community-projects/cats-mtl-forward-compat"]
path = community-build/community-projects/cats-mtl-forward-compat
url = https://github.com/dotty-staging/cats-mtl.git
[submodule "community-build/community-projects/coop-forward-compat"]
path = community-build/community-projects/coop-forward-compat
url = https://github.com/dotty-staging/coop.git
[submodule "community-build/community-projects/cats-effect-3-forward-compat"]
path = community-build/community-projects/cats-effect-3-forward-compat
url = https://github.com/dotty-staging/cats-effect.git
branch = series/3.x
[submodule "community-build/community-projects/scalacheck-forward-compat"]
path = community-build/community-projects/scalacheck-forward-compat
url = https://github.com/dotty-staging/scalacheck
[submodule "community-build/community-projects/http4s"]
path = community-build/community-projects/http4s
url = https://github.com/dotty-staging/http4s.git
Submodule cats-effect-3-forward-compat deleted from 251097
1 change: 0 additions & 1 deletion community-build/community-projects/cats-forward-compat
Submodule cats-forward-compat deleted from 6bbbc1
1 change: 0 additions & 1 deletion community-build/community-projects/cats-mtl-forward-compat
Submodule cats-mtl-forward-compat deleted from 149f00
1 change: 0 additions & 1 deletion community-build/community-projects/coop-forward-compat
Submodule coop-forward-compat deleted from 8700dd
Submodule discipline-forward-compat deleted from afd001
Submodule discipline-munit-forward-compat deleted from 38ea89
Submodule discipline-specs2-forward-compat deleted from e689c3
1 change: 0 additions & 1 deletion community-build/community-projects/munit-forward-compat
Submodule munit-forward-compat deleted from 92f3ad
Submodule scalacheck-forward-compat deleted from 976db3
Submodule simulacrum-scalafix-forward-compat deleted from 251527
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ object CommunityBuildRunner:
* for more infrastructural details.
*/
extension (self: CommunityProject) def run()(using suite: CommunityBuildRunner): Unit =
if self.requiresExperimental && !self.compilerSupportExperimental then
if self.requiresExperimental && !compilerSupportExperimental then
log(s"Skipping ${self.project} - it needs experimental features unsupported in this build.")
return
self.dependencies().foreach(_.publish())
self.dependencies.foreach(_.publish())
self.testOnlyDependencies().foreach(_.publish())
suite.runProject(self)

Expand All @@ -45,7 +45,6 @@ trait CommunityBuildRunner:
val project = projectDef.project
val command = projectDef.binaryName
val arguments = projectDef.buildCommands
val compilerVersion = projectDef.compilerVersion

@annotation.tailrec
def execTimes(task: () => Int, timesToRerun: Int): Boolean =
Expand Down
2 changes: 1 addition & 1 deletion community-build/src/scala/dotty/communitybuild/Main.scala
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ object Main:
val (toRun, ignored) =
allProjects.partition( p =>
p.docCommand != null
&& (!p.requiresExperimental || p.compilerSupportExperimental)
&& (!p.requiresExperimental || compilerSupportExperimental)
)

val paths = toRun.map { project =>
Expand Down
Loading