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

[8.0.0] Backport of a few CI fixes for 8.0.0 #24269

Merged
merged 5 commits into from
Nov 11, 2024
Merged

[8.0.0] Backport of a few CI fixes for 8.0.0 #24269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
332b195
Re-enable remote cache for macOS builds in postsubmit
meteorcloudy Nov 6, 2024
c0d6814
Bump the test timeouts and fine-tune the test jobs number on macOS arm64
meteorcloudy Nov 7, 2024
41ac9af
Migrate imp to importlib in path_test.py
meteorcloudy Nov 8, 2024
540c07d
No public description
meteorcloudy Nov 8, 2024
b492813
Disable cc_builtin_tests on Intel macOS in presubmit
meteorcloudy Nov 11, 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
5 changes: 4 additions & 1 deletion .bazelci/postsubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,10 @@ tasks:
- "//src:test_repos"
test_flags:
- "--config=ci-macos"
- "--noremote_accept_cached"
# Fine tune the number of test jobs running in parallel to avoid timeout
- "--local_test_jobs=2"
# Increase the test timeout by 20% to avoid flaky test failures due to timeout
- "--test_timeout=72,360,1080,4320"
test_targets:
- "//scripts/..."
- "//src/main/starlark/tests/builtins_bzl/..."
Expand Down
5 changes: 5 additions & 0 deletions .bazelci/presubmit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ tasks:
# Disable python and shell integration tests on Intel Macs
- "-//src/test/shell/..."
- "-//src/test/py/..."
- "-//src/main/starlark/tests/builtins_bzl:cc_builtin_tests"
# https://github.com/bazelbuild/bazel/issues/17410
- "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
# Disable android tests since we are moving Android rules out of the Bazel repo.
Expand All @@ -201,6 +202,10 @@ tasks:
- "//src:test_repos"
test_flags:
- "--config=ci-macos"
# Fine tune the number of test jobs running in parallel to avoid timeout
- "--local_test_jobs=2"
# Increase the test timeout by 20% to avoid flaky test failures due to timeout
- "--test_timeout=72,360,1080,4320"
test_targets:
- "//scripts/..."
- "//src/main/starlark/tests/builtins_bzl/..."
Expand Down
2 changes: 1 addition & 1 deletion src/test/py/bazel/bzlmod/bazel_overrides_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def testCmdAbsoluteModuleOverride(self):
'bazel_dep(name = "ss", version = "1.0")',
'local_path_override(',
' module_name = "ss",',
' path = "%s",' % self.Path('aa'),
' path = "%s",' % self.Path('aa').replace('\\', '/'),
')',
],
)
Expand Down
12 changes: 8 additions & 4 deletions tools/build_defs/pkg/path_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@
# limitations under the License.
"""Testing for helper functions."""

import imp
import importlib.machinery
import importlib.util
import unittest

pkg_bzl = imp.load_source(
'pkg_bzl',
'tools/build_defs/pkg/path.bzl')

loader = importlib.machinery.SourceFileLoader(
'pkg_bzl', 'tools/build_defs/pkg/path.bzl')
spec = importlib.util.spec_from_loader(loader.name, loader)
pkg_bzl = importlib.util.module_from_spec(spec)
loader.exec_module(pkg_bzl)


class File(object):
Expand Down
Loading