Skip to content

tests: make workspace CI jobs enable workspace mode #2435

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

Merged
merged 4 commits into from
Nov 21, 2024
Merged

tests: make workspace CI jobs enable workspace mode #2435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ff2d97d
fix: flags on CI workspace setups
comius Nov 21, 2024
0d3ea78
Skip integration tests on Windows workspace mode.
comius Nov 21, 2024
65e159c
fix windows integration test failure; use regular common_workspace_fl…
rickeylev Nov 21, 2024
1447fbf
make windows+workspace skip tests/integration; too many weird failure…
rickeylev Nov 21, 2024
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
23 changes: 23 additions & 0 deletions .bazelci/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ tasks:
bazel: last_rc
ubuntu_workspace:
<<: *reusable_config
<<: *common_workspace_flags
name: "Default: Ubuntu, workspace"
platform: ubuntu2004
mac_workspace:
Expand All @@ -141,8 +142,30 @@ tasks:
platform: macos
windows_workspace:
<<: *reusable_config
<<: *common_workspace_flags
name: "Default: Windows, workspace"
platform: windows
# Most of tests/integration are failing on Windows w/workspace. Skip them
# for now until we can look into it.
build_targets:
- "--"
- "..."
# As a regression test for #225, check that wheel targets still build when
# their package path is qualified with the repo name.
- "@rules_python//examples/wheel/..."
build_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
- "--keep_going"
- "--build_tag_filters=-integration-test"
- "--config=bazel7.x"
test_targets:
- "--"
- "..."
test_flags:
- "--noenable_bzlmod"
- "--enable_workspace"
- "--test_tag_filters=-integration-test"

debian:
<<: *reusable_config
Expand Down
5 changes: 3 additions & 2 deletions tests/integration/local_toolchains/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ def test_python_from_path_used(self):
[shell_path, "-c", "import sys; print(sys.executable)"],
text=True,
)
expected = expected.strip()
self.assertEqual(expected, sys.executable)
expected = expected.strip().lower()
# Normalize case: Windows may have case differences
self.assertEqual(expected.lower(), sys.executable.lower())


if __name__ == "__main__":
Expand Down