Skip to content

Commit

Permalink
ci: add last_rc, remove extraneous pystar configs (#2405)
Browse files Browse the repository at this point in the history
Run the bzlmod example with last_rc to match the BCR config. This should
help catch any
issues before a BCR release occurs.

Along the way, cleanup the extraneous pystar configs. The rules_python
Starlark
implementation is enabled by default, and disabling it is unsupported.
  • Loading branch information
rickeylev authored Nov 14, 2024
1 parent c8ccd22 commit 273cbd1
Showing 1 changed file with 29 additions and 24 deletions.
53 changes: 29 additions & 24 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ buildifier:
build_flags:
- "--keep_going"
- "--build_tag_filters=-integration-test"
- "--config=bazel7.x"
test_targets:
- "--"
- "..."
Expand Down Expand Up @@ -84,16 +85,6 @@ buildifier:
- //tests:version_3_8_test
- //tests:version_3_9_test
- //tests:version_default_test
.pystar_base: &pystar_base
bazel: "7.x"
environment:
RULES_PYTHON_ENABLE_PYSTAR: "1"
build_flags:
- "--config=bazel7.x"
test_flags:
# The doc check tests fail because the Starlark implementation makes the
# PyInfo and PyRuntimeInfo symbols become documented.
- "--test_tag_filters=-integration-test,-doc_check_test"
tasks:
gazelle_extension_min:
<<: *common_workspace_flags_min_bazel
Expand Down Expand Up @@ -139,26 +130,18 @@ tasks:
name: "Default: Ubuntu, upcoming Bazel"
platform: ubuntu2004
bazel: last_rc
pystar_ubuntu_workspace:
<<: *reusable_config
<<: *pystar_base
name: "Default test: Ubuntu, Pystar, workspace"
platform: ubuntu2004
pystar_ubuntu_bzlmod:
ubuntu_workspace:
<<: *reusable_config
<<: *pystar_base
name: "Default test: Ubuntu, Pystar, bzlmod"
name: "Default: Ubuntu, workspace"
platform: ubuntu2004
pystar_mac_workspace:
mac_workspace:
<<: *reusable_config
<<: *common_workspace_flags
<<: *pystar_base
name: "Default test: Mac, Pystar, workspace"
name: "Default: Mac, workspace"
platform: macos
pystar_windows_workspace:
windows_workspace:
<<: *reusable_config
<<: *pystar_base
name: "Default test: Windows, Pystar, workspace"
name: "Default: Windows, workspace"
platform: windows

debian:
Expand Down Expand Up @@ -250,6 +233,13 @@ tasks:
working_directory: examples/bzlmod
platform: ubuntu2004
bazel: 7.x
integration_test_bzlmod_ubuntu_upcoming:
<<: *reusable_build_test_all
<<: *coverage_targets_example_bzlmod
name: "examples/bzlmod: Ubuntu, upcoming Bazel"
working_directory: examples/bzlmod
platform: ubuntu2004
bazel: last_rc
integration_test_bzlmod_debian:
<<: *reusable_build_test_all
<<: *coverage_targets_example_bzlmod
Expand All @@ -264,12 +254,27 @@ tasks:
working_directory: examples/bzlmod
platform: macos
bazel: 7.x
integration_test_bzlmod_macos_upcoming:
<<: *reusable_build_test_all
<<: *coverage_targets_example_bzlmod
name: "examples/bzlmod: macOS, upcoming Bazel"
working_directory: examples/bzlmod
platform: macos
bazel: last_rc
integration_test_bzlmod_windows:
<<: *reusable_build_test_all
# coverage is not supported on Windows
name: "examples/bzlmod: Windows"
working_directory: examples/bzlmod
platform: windows
bazel: 7.x
integration_test_bzlmod_windows_upcoming:
<<: *reusable_build_test_all
# coverage is not supported on Windows
name: "examples/bzlmod: Windows, upcoming Bazel"
working_directory: examples/bzlmod
platform: windows
bazel: last_rc
integration_test_bzlmod_ubuntu_lockfile:
<<: *reusable_build_test_all
<<: *coverage_targets_example_bzlmod
Expand Down

0 comments on commit 273cbd1

Please sign in to comment.