Skip to content
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.

Sign up for GitHub

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

Jump to bottom

WIP: disable WORKSPACE in shell integration tests #23087

Closed
wants to merge 107 commits into from
Closed

WIP: disable WORKSPACE in shell integration tests #23087

wants to merge 107 commits into from

Conversation

meteorcloudy
Copy link
Member

@meteorcloudy meteorcloudy commented Jul 24, 2024 •
edited
Loading

Working towards #23023

This PR is huge, I'm going to try to break it down:

  • Add MODULE.bazel setup in testenv.sh
  • Migrate tests in batches
  • Remove WORKSPACE setup in testenv.sh and add --noenable_workspace by default (some test cases can still enable WORKSPACE)

@meteorcloudy meteorcloudy marked this pull request as draft July 24, 2024 12:05
@github-actions github-actions bot added team-Android Issues for Android team awaiting-review PR is awaiting review from an assigned reviewer labels Jul 24, 2024
@meteorcloudy meteorcloudy mentioned this pull request Jul 24, 2024
Closed
13 tasks
@ted-xie
Copy link
Contributor

ted-xie commented Jul 24, 2024

All of the native Android rule tests require WORKSPACE to exist, so I think CI won't pass until we delete those tests and eventually the rules.

@meteorcloudy
Copy link
Member Author

meteorcloudy commented Jul 24, 2024 •
edited
Loading

All of the native Android rule tests require WORKSPACE to exist, so I think CI won't pass until we delete those tests and eventually the rules.

Do you still want to keep the android tests in Bazel repo? (We disabled them on macOS already) If so, we can still set --enable_workspace for those tests.

@ted-xie
Copy link
Contributor

ted-xie commented Jul 24, 2024

I don't think we've migrated all of these tests to rules_android yet, so we can't outright delete them for now. I'd be OK with disabling them for Linux and Windows to unblock this work.

@meteorcloudy
Copy link
Member Author

Got it, then I'll just enable WORKSPACE for those tests to keep them running.

@meteorcloudy meteorcloudy force-pushed the disable_workspace_sh branch 4 times, most recently from f1e76db to 533d3a7 Compare August 2, 2024 09:33
@meteorcloudy meteorcloudy mentioned this pull request Aug 7, 2024
Closed
copybara-service bot pushed a commit that referenced this pull request Aug 7, 2024
@meteorcloudy @copybara-github
Make Android tests work with --enable_workspace=false
0831f1a 
A part of #23087

Working towards: #23023

Android tests are leaving the Bazel codebases, so it's fine to not migrate the legacy tests to Bzlmod.

PiperOrigin-RevId: 660569455
Change-Id: Ibde570e27f6f76443fe7e74a92c7fa18d967e7af
copybara-service bot pushed a commit that referenced this pull request Aug 8, 2024
@meteorcloudy @copybara-github
Prepare for flipping --enable_workspace to false for shell tests
e1eded6 
- Added functions for setting up common dependencies in MODULE.bazel
- Use a shorter bazel_root on Windows
- Added setup_module_dot_bazel to replace write_default_lockfile eventually
- Removed TEST_REPOSITORY_HOME support

A part of #23087

Working towards: #23023

PiperOrigin-RevId: 660748611
Change-Id: I55193953b429c18414ec092f567c98af36d7c34a
copybara-service bot pushed a commit that referenced this pull request Aug 8, 2024
@meteorcloudy @copybara-github
Make sure coverage tests work with --enable_workspace=false
ac7a0ff 
A part of #23087

Working towards: #23023

PiperOrigin-RevId: 660758318
Change-Id: Icdfdaed35dc9920c628c4f89ac28ff38ef88a6d3
copybara-service bot pushed a commit that referenced this pull request Aug 8, 2024
@meteorcloudy @copybara-github
Make sure src/test/shell/bazel/local_repository_test.sh work with --e…
cba0c89 
…nable_workspace=false

A part of #23087

Working towards: #23023

PiperOrigin-RevId: 660765907
Change-Id: I1abd86420b93f7dec174607c549fc1fa09f4730d
copybara-service bot pushed a commit that referenced this pull request Aug 8, 2024
@meteorcloudy @copybara-github
Make sure starlark_* tests work with --enable_workspace=false
19b1104 
A part of #23087

Working towards: #23023

PiperOrigin-RevId: 660767730
Change-Id: I6ba96928d6aaa3e6bc93a4ce442aa1b04992c5c0
copybara-service bot pushed a commit that referenced this pull request Aug 8, 2024
@meteorcloudy @copybara-github
Make sure external_* tests work with --enable_workspace=false
e377515 
A part of #23087

Working towards: #23023

PiperOrigin-RevId: 660778111
Change-Id: I98469a867733204aa6d2e428d36faba60fa91cb6
copybara-service bot pushed a commit that referenced this pull request Aug 8, 2024
@meteorcloudy @copybara-github
Make sure bazel_rules_* tests work with --enable_workspace=false
e5b8f5a 
A part of #23087

Working towards: #23023

PiperOrigin-RevId: 660787082
Change-Id: Iad10e9795db06421c104e149bd2e695262ff225b
copybara-service bot pushed a commit that referenced this pull request Aug 9, 2024
@meteorcloudy @copybara-github
Make sure all other shell/bazel tests work with --enable_workspace=false
7c7aafa 
A part of #23087

Working towards: #23023

PiperOrigin-RevId: 661156778
Change-Id: I7783ce606869dcc3b5f21cee765f196ba3b365cd
copybara-service bot pushed a commit that referenced this pull request Aug 9, 2024
@meteorcloudy @copybara-github
Make sure all other shell/integration tests work with --enable_worksp…
a851658 
…ace=false

A part of #23087

Working towards: #23023

PiperOrigin-RevId: 661158600
Change-Id: Ib16db0042ff40baaf15937f3320e3a32f5211b36
copybara-service bot pushed a commit that referenced this pull request Aug 9, 2024
@meteorcloudy @copybara-github
Disable WORKSPACE in shell integration tests
ca02978 
Final part of #23087

Working towards #23023

PiperOrigin-RevId: 661381915
Change-Id: I1fca0e24bf2f424a3e438ab6fb68e9ae815118f6
@meteorcloudy
Copy link
Member Author

This PR has been broken down and merged.

@github-actions github-actions bot removed the awaiting-review PR is awaiting review from an assigned reviewer label Aug 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allevato allevato Awaiting requested review from allevato allevato will be requested when the pull request is marked ready for review allevato is a code owner

@DavidGoldman DavidGoldman Awaiting requested review from DavidGoldman DavidGoldman will be requested when the pull request is marked ready for review DavidGoldman is a code owner

@dmaclach dmaclach Awaiting requested review from dmaclach dmaclach will be requested when the pull request is marked ready for review dmaclach is a code owner

@thomasvl thomasvl Awaiting requested review from thomasvl thomasvl will be requested when the pull request is marked ready for review thomasvl is a code owner

@ahumesky ahumesky Awaiting requested review from ahumesky ahumesky will be requested when the pull request is marked ready for review ahumesky is a code owner

@ted-xie ted-xie Awaiting requested review from ted-xie ted-xie will be requested when the pull request is marked ready for review ted-xie is a code owner

Assignees
No one assigned
Labels
team-Android Issues for Android team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@meteorcloudy @ted-xie