ci: add ci config to test 7 and 8 for bcr like setup (bazel-contrib#3404)

Run the examples that BCR uses as tests in a more similar way to BCR.

Unfortunately, this breaks the gazelle plugin on Windows due to bazel-contrib#3416,
so testing of
it is removed.

Work towards bazel-contrib#3392

---------

Co-authored-by: Richard Levasseur <rlevasseur@google.com>

Author: aignas

.bazelci/presubmit.yml

@@ -91,7 +91,63 @@ buildifier:
     - //tests:version_3_13_test
     - //tests:version_3_14_test
     - //tests:version_default_test
+
+# Keep in sync with .bcr/gazelle/presubmit.yml
+.gazelle_common_bcr: &gazelle_common_bcr
+    bazel: ${{ bazel }}
+    working_directory: gazelle/examples/bzlmod_build_file_generation
+    shell_commands:
+      - "echo 'common --override_module=rules_python=' >> .bazelrc"
+      - "bazel run //:gazelle_python_manifest.update"
+      - "bazel run //:gazelle -- update"
+    batch_commands:
+      - "echo common --override_module=rules_python= >> .bazelrc "
+      - " bazel run //:gazelle_python_manifest.update "
+      - " bazel run //:gazelle -- update"
+    build_targets:
+      - "//..."
+      - ":modules_map"
+    test_targets:
+      - "//..."
+
+
+matrix:
+  platform:
+    - ubuntu2204
+    - debian11
+    - macos_arm64
+    - windows
+  bazel: [7.*, 8.*]
+
 tasks:
+  # Keep in sync with .bcr/presubmit.yml
+  bcr_test:
+    name: "BCR: Bazel {bazel}"
+    platform: ${{ platform }}
+    working_directory: examples/bzlmod
+    bazel: ${{ bazel }}
+    build_flags:
+      - "--keep_going"
+    test_flags:
+      - "--keep_going"
+    build_targets:
+      - "//..."
+    test_targets:
+      - "//..."
+
+  gazelle_bcr_ubuntu:
+    <<: *gazelle_common_bcr
+    name: "Gazelle: BCR, Bazel {bazel}"
+    platform: ubuntu2204
+  gazelle_bcr_debian11:
+    <<: *gazelle_common_bcr
+    name: "Gazelle: BCR, Bazel {bazel}"
+    platform: debian11
+  gazelle_bcr_macos_arm64:
+    <<: *gazelle_common_bcr
+    name: "Gazelle: BCR, Bazel {bazel}"
+    platform: macos_arm64
+
   gazelle_extension_min:
     <<: *common_workspace_flags_min_bazel
     <<: *minimum_supported_version
@@ -262,113 +318,15 @@ tasks:
     working_directory: examples/build_file_generation
     platform: windows
 
-  integration_test_bzlmod_ubuntu_min:
-    <<: *minimum_supported_version
-    <<: *reusable_build_test_all
-    coverage_targets: ["//:test"]
-    name: "examples/bzlmod: Ubuntu, minimum Bazel"
-    working_directory: examples/bzlmod
-    platform: ubuntu2204
-    bazel: 7.x
-  integration_test_bzlmod_ubuntu:
-    <<: *reusable_build_test_all
-    <<: *coverage_targets_example_bzlmod
-    name: "examples/bzlmod: Ubuntu"
-    working_directory: examples/bzlmod
-    platform: ubuntu2204
-    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: ubuntu2204
-    bazel: last_rc
-  integration_test_bzlmod_debian:
-    <<: *reusable_build_test_all
-    <<: *coverage_targets_example_bzlmod
-    name: "examples/bzlmod: Debian"
-    working_directory: examples/bzlmod
-    platform: debian11
-    bazel: 7.x
   integration_test_bzlmod_ubuntu_vendor:
     <<: *reusable_build_test_all
     name: "examples/bzlmod: bazel vendor"
     working_directory: examples/bzlmod
     platform: ubuntu2204
     shell_commands:
-    - "bazel vendor --vendor_dir=./vendor //..."
-    - "bazel build --vendor_dir=./vendor //..."
-    - "rm -rf ./vendor"
-  integration_test_bzlmod_macos:
-    <<: *reusable_build_test_all
-    <<: *coverage_targets_example_bzlmod
-    name: "examples/bzlmod: macOS"
-    working_directory: examples/bzlmod
-    platform: macos_arm64
-    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_arm64
-    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_generate_build_file_generation_ubuntu_min:
-    <<: *minimum_supported_version
-    <<: *reusable_build_test_all
-    <<: *coverage_targets_example_bzlmod_build_file_generation
-    name: "gazelle/examples/bzlmod_build_file_generation: Ubuntu, minimum Bazel"
-    working_directory: gazelle/examples/bzlmod_build_file_generation
-    platform: ubuntu2204
-    bazel: 7.x
-  integration_test_bzlmod_generation_build_files_ubuntu:
-    <<: *reusable_build_test_all
-    <<: *coverage_targets_example_bzlmod_build_file_generation
-    name: "gazelle/examples/bzlmod_build_file_generation: Ubuntu"
-    working_directory: gazelle/examples/bzlmod_build_file_generation
-    platform: ubuntu2204
-  integration_test_bzlmod_generation_build_files_ubuntu_run:
-    <<: *reusable_build_test_all
-    name: "gazelle/examples/bzlmod_build_file_generation: Ubuntu, Gazelle and pip"
-    working_directory: gazelle/examples/bzlmod_build_file_generation
-    platform: ubuntu2204
-    shell_commands:
-    - "bazel run //:gazelle_python_manifest.update"
-    - "bazel run //:gazelle -- update"
-  integration_test_bzlmod_build_file_generation_debian:
-    <<: *reusable_build_test_all
-    <<: *coverage_targets_example_bzlmod_build_file_generation
-    name: "gazelle/examples/bzlmod_build_file_generation: Debian"
-    working_directory: gazelle/examples/bzlmod_build_file_generation
-    platform: debian11
-  integration_test_bzlmod_build_file_generation_macos:
-    <<: *reusable_build_test_all
-    <<: *coverage_targets_example_bzlmod_build_file_generation
-    name: "gazelle/examples/bzlmod_build_file_generation: MacOS"
-    working_directory: gazelle/examples/bzlmod_build_file_generation
-    platform: macos_arm64
-  integration_test_bzlmod_build_file_generation_windows:
-    <<: *reusable_build_test_all
-    # coverage is not supported on Windows
-    name: "gazelle/examples/bzlmod_build_file_generation: Windows"
-    working_directory: gazelle/examples/bzlmod_build_file_generation
-    platform: windows
+      - "bazel vendor --vendor_dir=./vendor //..."
+      - "bazel build --vendor_dir=./vendor //..."
+      - "rm -rf ./vendor"
 
   integration_test_multi_python_versions_ubuntu_workspace:
     <<: *reusable_build_test_all

.bcr/gazelle/presubmit.yml

@@ -15,17 +15,28 @@
 bcr_test_module:
   module_path: "examples/bzlmod_build_file_generation"
   matrix:
-    platform: ["debian11", "macos", "ubuntu2004", "windows"]
-    bazel: [7.x, 8.x]
+    platform: [
+      "debian11",
+      "macos",
+      "ubuntu2204",
+    ]
+    bazel: [
+      7.*,
+      8.*,
+    ]
   tasks:
     run_tests:
       name: "Run test module"
       platform: ${{ platform }}
       bazel: ${{ bazel }}
       shell_commands:
         - "echo 'common --override_module=rules_python=' >> .bazelrc"
+        - "bazel run //:gazelle_python_manifest.update"
+        - "bazel run //:gazelle -- update"
       batch_commands:
         - "echo common --override_module=rules_python= >> .bazelrc"
+        - "bazel run //:gazelle_python_manifest.update"
+        - "bazel run //:gazelle -- update"
       build_targets:
         - "//..."
         - ":modules_map"

.bcr/presubmit.yml

@@ -15,17 +15,19 @@
 bcr_test_module:
   module_path: "examples/bzlmod"
   matrix:
-    platform: ["debian11", "macos", "ubuntu2004", "windows"]
-    bazel: [7.x, 8.x]
+    platform: ["debian11", "macos", "ubuntu2204", "windows"]
+    bazel: [7.*, 8.*]
   tasks:
     run_tests:
       name: "Run test module"
       platform: ${{ platform }}
       bazel: ${{ bazel }}
       test_flags:
+        # Minimum bazel supported C++
         - "--keep_going"
-          # Without these cxxopts, BCR's Mac builds fail
-        - '--cxxopt=-std=c++14'
-        - '--host_cxxopt=-std=c++14'
+        - '--cxxopt=-std=c++17'
+        - '--host_cxxopt=-std=c++17'
+      build_targets:
+        - "//..."
       test_targets:
         - "//..."

CHANGELOG.md

@@ -53,6 +53,12 @@ END_UNRELEASED_TEMPLATE
 
 [0.0.0]: https://github.com/bazel-contrib/rules_python/releases/tag/0.0.0
 
+{#v0-0-0-known-issues}
+### Known Issues
+* (gazelle) Windows support for the Gazelle plugin may be broken. See
+  [#3416](https://github.com/bazel-contrib/rules_python/issues/3416) for
+  details and possible workarounds.
+
 {#v0-0-0-removed}
 ### Removed
 * (toolchain) Remove all of the python 3.8 toolchain support out of the box. Users need
@@ -75,6 +81,8 @@ END_UNRELEASED_TEMPLATE
 * (pip) `pipstar` has been enabled for all `whl_library` instances where the whl
   is passed through a label or downloaded using the bazel downloader
   ([#2949](https://github.com/bazel-contrib/rules_python/issues/2949)).
+* (gazelle deps) rules_go bumped from 0.55.1 to 0.59.0
+* (gazelle deps) gazelle bumped from 0.36.0 to 0.47.0
 
 {#v0-0-0-fixed}
 ### Fixed

examples/bzlmod/.bazelrc

@@ -5,6 +5,17 @@ startup --windows_enable_symlinks
 
 common --enable_bzlmod
 common --lockfile_mode=update
+# This adds an implicit --config=<osname>
+# See docs for osname values
+# https://bazel.build/reference/command-line-reference#common_options-flag--enable_platform_specific_config
+common --enable_platform_specific_config
+
+common:windows --cxxopt=/std:c++17
+common:windows --host_cxxopt=/std:c++17
+common:linux --cxxopt=-std=c++17
+common:linux --host_cxxopt=-std=c++17
+common:macos --cxxopt=-std=c++17
+common:macos --host_cxxopt=-std=c++17
 
 coverage --java_runtime_version=remotejdk_11
 

examples/bzlmod/MODULE.bazel

@@ -17,7 +17,7 @@ bazel_dep(name = "protobuf", version = "27.0", repo_name = "com_google_protobuf"
 
 # Only needed to make rules_python's CI happy. rules_java 8.3.0+ is needed so
 # that --java_runtime_version=remotejdk_11 works with Bazel 8.
-bazel_dep(name = "rules_java", version = "8.3.1")
+bazel_dep(name = "rules_java", version = "8.16.1")
 
 # Only needed to make rules_python's CI happy. A test verifies that
 # MODULE.bazel.lock is cross-platform friendly, and there are transitive

examples/multi_python_versions/MODULE.bazel

@@ -75,4 +75,4 @@ bazel_dep(name = "rules_shell", version = "0.2.0", dev_dependency = True)
 
 # Only needed to make rules_python's CI happy. rules_java 8.3.0+ is needed so
 # that --java_runtime_version=remotejdk_11 works with Bazel 8.
-bazel_dep(name = "rules_java", version = "8.3.1")
+bazel_dep(name = "rules_java", version = "8.16.1")

gazelle/MODULE.bazel

@@ -6,8 +6,8 @@ module(
 
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "rules_python", version = "0.18.0")
-bazel_dep(name = "rules_go", version = "0.55.1", repo_name = "io_bazel_rules_go")
-bazel_dep(name = "gazelle", version = "0.36.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "rules_go", version = "0.59.0", repo_name = "io_bazel_rules_go")
+bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")
 bazel_dep(name = "rules_cc", version = "0.0.16")
 
 local_path_override(

gazelle/examples/bzlmod_build_file_generation/.bazelrc

@@ -3,7 +3,7 @@ test --test_output=errors --enable_runfiles
 # Windows requires these for multi-python support:
 build --enable_runfiles
 
-common --experimental_enable_bzlmod
+common --enable_bzlmod
 
 coverage --java_runtime_version=remotejdk_11
 common:bazel7.x --incompatible_python_disallow_native_rules

gazelle/examples/bzlmod_build_file_generation/MODULE.bazel

@@ -31,7 +31,7 @@ local_path_override(
 # The following stanza defines the dependency for gazelle
 # See here https://github.com/bazelbuild/bazel-gazelle/releases/ for the
 # latest version.
-bazel_dep(name = "gazelle", version = "0.36.0", repo_name = "bazel_gazelle")
+bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")
 
 # The following stanze returns a proxy object representing a module extension;
 # its methods can be invoked to create module extension tags.
@@ -84,4 +84,4 @@ local_path_override(
 )
 
 # Only needed to make rules_python's CI happy
-bazel_dep(name = "rules_java", version = "8.3.1")
+bazel_dep(name = "rules_java", version = "8.16.1")