Patch out duplicate clang-cl/msvc constraint and try using example module_path

Author: zhangskz

modules/protobuf/30.0-rc1/patches/remove-redundant-clang-cl-msvc-constraint.patch

@@ -1,66 +1,68 @@
-matrix:
-  # Removing ubuntu just for this release candidate
-  platform: ["debian10", "macos"]
-  bazel: [7.x, 8.x]
-
-tasks:
-  verify_targets:
-    name: "Verify build targets"
-    platform: ${{ platform }}
-    bazel: ${{ bazel }}
-    build_flags:
-    - '--host_cxxopt=-std=c++17'
-    - '--cxxopt=-std=c++17'   
-    build_targets:
-    - '@protobuf//:protobuf'
-    - '@protobuf//:protobuf_lite'
-    - '@protobuf//:protobuf_python'
-    - '@protobuf//:protobuf_java'
-    - '@protobuf//:protoc'
-    - '@protobuf//:test_messages_proto2_cc_proto'
-    - '@protobuf//:test_messages_proto3_cc_proto'
-  # Separating windows for different c++ build flags.
-  verify_targets_windows:
-    name: "Verify windows build targets"
-    platform: windows
-    bazel: ${{ bazel }}
-    build_flags:
-    - '--cxxopt=/std:c++17'
-    - '--host_cxxopt=/std:c++17'
-    - '--extra_execution_platforms=@protobuf//build_defs:x64_windows-clang-cl'
-    - '--host_platform=@protobuf//build_defs:x64_windows-clang-cl'
-    - '--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl'
-    build_targets:
-    - '@protobuf//:protobuf'
-    - '@protobuf//:protobuf_lite'
-    - '@protobuf//:protobuf_python'
-    - '@protobuf//:protobuf_java'
-    - '@protobuf//:protoc'
-    - '@protobuf//:test_messages_proto2_cc_proto'
-    - '@protobuf//:test_messages_proto3_cc_proto'
-
 bcr_test_module:
-  module_path: "examples"
+  module_path: examples
   matrix:
     # Removing ubuntu just for this release candidate
     platform: ["debian10", "macos"]
     bazel: [7.x, 8.x]
+
   tasks:
-    run_test_module:
-      name: "Run test module"
+    verify_targets:
+      name: "Verify build targets"
       platform: ${{ platform }}
       bazel: ${{ bazel }}
       build_flags:
       - '--host_cxxopt=-std=c++17'
-      - '--cxxopt=-std=c++17'
+      - '--cxxopt=-std=c++17'   
       build_targets:
-      - "//..."
-    run_test_module_windows:
-      name: "Run windows test module"
+      - '@protobuf//:protobuf'
+      - '@protobuf//:protobuf_lite'
+      - '@protobuf//:protobuf_python'
+      - '@protobuf//:protobuf_java'
+      - '@protobuf//:protoc'
+      - '@protobuf//:test_messages_proto2_cc_proto'
+      - '@protobuf//:test_messages_proto3_cc_proto'
+    # Separating windows for different c++ build flags.
+    verify_targets_windows:
+      name: "Verify windows build targets"
       platform: windows
       bazel: ${{ bazel }}
       build_flags:
       - '--cxxopt=/std:c++17'
       - '--host_cxxopt=/std:c++17'
+      - '--extra_execution_platforms=@protobuf//build_defs:x64_windows-clang-cl'
+      - '--host_platform=@protobuf//build_defs:x64_windows-clang-cl'
+      - '--extra_toolchains=@local_config_cc//:cc-toolchain-x64_windows-clang-cl'
       build_targets:
-      - "//..."
+      - '@protobuf//:protobuf'
+      - '@protobuf//:protobuf_lite'
+      - '@protobuf//:protobuf_python'
+      - '@protobuf//:protobuf_java'
+      - '@protobuf//:protoc'
+      - '@protobuf//:test_messages_proto2_cc_proto'
+      - '@protobuf//:test_messages_proto3_cc_proto'
+
+  bcr_test_module:
+    module_path: "examples"
+    matrix:
+      # Removing ubuntu just for this release candidate
+      platform: ["debian10", "macos"]
+      bazel: [7.x, 8.x]
+    tasks:
+      run_test_module:
+        name: "Run test module"
+        platform: ${{ platform }}
+        bazel: ${{ bazel }}
+        build_flags:
+        - '--host_cxxopt=-std=c++17'
+        - '--cxxopt=-std=c++17'
+        build_targets:
+        - "//..."
+      run_test_module_windows:
+        name: "Run windows test module"
+        platform: windows
+        bazel: ${{ bazel }}
+        build_flags:
+        - '--cxxopt=/std:c++17'
+        - '--host_cxxopt=/std:c++17'
+        build_targets:
+        - "//..."

modules/protobuf/30.0-rc1/presubmit.yml

@@ -1,5 +1,8 @@
 {
     "integrity": "sha256-p0wGf/NH7knNqhLEz3bbmNIsvL6iOrOBPX1TwGAToWA=",
+    "patches": {
+        "remove-redundant-clang-cl-msvc-constraint.patch": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="
+    },
     "strip_prefix": "protobuf-30.0-rc1",
     "url": "https://github.com/protocolbuffers/protobuf/releases/download/v30.0-rc1/protobuf-30.0-rc1.zip"
 }

modules/protobuf/30.0-rc1/source.json

@@ -22,76 +22,76 @@
             "name": "Jerry Berg"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "acozzette",
-            "name": "Adam Cozzette",
-            "do_not_notify": true
+            "name": "Adam Cozzette"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "deannagarcia",
-            "name": "Deanna Garcia",
-            "do_not_notify": true
+            "name": "Deanna Garcia"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "esrauchg",
-            "name": "Em Rauch",
-            "do_not_notify": true
+            "name": "Em Rauch"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "haberman",
-            "name": "Josh Haberman",
-            "do_not_notify": true
+            "name": "Josh Haberman"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "honglooker",
-            "name": "Hong Shin",
-            "do_not_notify": true
+            "name": "Hong Shin"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "JasonLunn",
-            "name": "Jason Lunn",
-            "do_not_notify": true
+            "name": "Jason Lunn"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "anandolee",
-            "name": "Jie Luo",
-            "do_not_notify": true
+            "name": "Jie Luo"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "salo",
-            "name": "Eric Salo",
-            "do_not_notify": true
+            "name": "Eric Salo"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "sbenzaquen",
-            "name": "Samuel Benzaquen",
-            "do_not_notify": true
+            "name": "Samuel Benzaquen"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "shaod2",
-            "name": "Dennis Shao",
-            "do_not_notify": true
+            "name": "Dennis Shao"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "theodorerose",
-            "name": "Theodore Rose",
-            "do_not_notify": true
+            "name": "Theodore Rose"
         },
         {
+            "do_not_notify": true,
             "email": "[email protected]",
             "github": "tonyliaoss",
-            "name": "Tony Liao",
-            "do_not_notify": true
+            "name": "Tony Liao"
         }
     ],
     "repository": [