Merge branch 'bazelbuild:master' into feature-lockfileupdate

.bazelci/postsubmit.yml

@@ -221,12 +221,6 @@ tasks:
       - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
       - "-//src/test/shell/bazel/android:aapt_integration_test"
       - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
     include_json_profile:
       - build
       - test
@@ -286,12 +280,10 @@ tasks:
       - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
       - "-//src/test/shell/bazel/android:aapt_integration_test"
       - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
+      # https://github.com/bazelbuild/bazel/issues/17411
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
+      # https://github.com/bazelbuild/bazel/issues/17447
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
     include_json_profile:
       - build
       - test

.bazelci/presubmit.yml

@@ -225,12 +225,6 @@ tasks:
       - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
       - "-//src/test/shell/bazel/android:aapt_integration_test"
       - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
     include_json_profile:
       - build
       - test
@@ -344,13 +338,10 @@ tasks:
       - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
       - "-//src/test/shell/bazel/android:aapt_integration_test"
       - "-//src/test/shell/bazel/android:aapt_integration_test_with_head_android_tools"
-      # Disable recently regressed tests: https://github.com/bazelbuild/bazel/issues/20437
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CppSysrootTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcImportConfiguredTargetTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
-      - "-//src/test/java/com/google/devtools/build/lib/rules/cpp:CcToolchainTest"
-      - "-//src/test/shell/integration:minimal_jdk_test"
+      # https://github.com/bazelbuild/bazel/issues/17411
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:PatchApiBlackBoxTest"
+      # https://github.com/bazelbuild/bazel/issues/17447
+      - "-//src/test/java/com/google/devtools/build/lib/blackbox/tests/workspace:GitRepositoryBlackBoxTest"
     include_json_profile:
       - build
       - test

.github/workflows/cherry-picker.yml

@@ -23,14 +23,14 @@ jobs:
           egress-policy: audit
       - if: github.event.pull_request
         name: Run cherrypicker on closed PR
-        uses: bazelbuild/continuous-integration/actions/cherry_picker@f0c572a32e187da026aaa3a1127e232ca423dd71
+        uses: bazelbuild/continuous-integration/actions/cherry_picker@d646a2d9a98e699bdba517276cf0e16cfff0c62c
         with:
           triggered-on: closed
           pr-number: ${{ github.event.number }}
           is-prod: True
       - if: github.event.issue
         name: Run cherrypicker on closed issue
-        uses: bazelbuild/continuous-integration/actions/cherry_picker@f0c572a32e187da026aaa3a1127e232ca423dd71
+        uses: bazelbuild/continuous-integration/actions/cherry_picker@d646a2d9a98e699bdba517276cf0e16cfff0c62c
         with:
           triggered-on: closed
           pr-number: ${{ github.event.issue.number }}
@@ -45,7 +45,7 @@ jobs:
           egress-policy: audit
       - if: startsWith(github.event.issue.body, 'Forked from')
         name: Run cherrypicker on comment
-        uses: bazelbuild/continuous-integration/actions/cherry_picker@f0c572a32e187da026aaa3a1127e232ca423dd71
+        uses: bazelbuild/continuous-integration/actions/cherry_picker@d646a2d9a98e699bdba517276cf0e16cfff0c62c
         with:
           triggered-on: commented
           pr-number: ${{ github.event.issue.body }}
@@ -54,7 +54,7 @@ jobs:
           is-prod: True
       - if: startsWith(github.event.issue.body, '### Commit IDs')
         name: Run cherrypicker on demand
-        uses: bazelbuild/continuous-integration/actions/cherry_picker@f0c572a32e187da026aaa3a1127e232ca423dd71
+        uses: bazelbuild/continuous-integration/actions/cherry_picker@d646a2d9a98e699bdba517276cf0e16cfff0c62c
         with:
           triggered-on: ondemand
           milestone-title: ${{ github.event.milestone.title }}

.github/workflows/labeler.yml

@@ -19,5 +19,5 @@ jobs:
       with:
         egress-policy: audit
 
-    - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0
+    - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0
     if: ${{ github.event.pull_request.draft == false && github.event.pull_request.user.login != 'bazel-io' }}

.github/workflows/release-helper.yml

@@ -18,6 +18,6 @@ jobs:
           egress-policy: audit
 
       - name: Run helper
-        uses: bazelbuild/continuous-integration/actions/release-helper@70ab2cc80222b90afde06fa0b3b7c067239777b4 # master
+        uses: bazelbuild/continuous-integration/actions/release-helper@d646a2d9a98e699bdba517276cf0e16cfff0c62c # master
         with:
           token: ${{ secrets.BAZEL_IO_TOKEN }}

.github/workflows/scorecard.yml

@@ -64,14 +64,14 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
         with:
           name: SARIF file
           path: results.sarif
           retention-days: 5
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
+        uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
         with:
           sarif_file: results.sarif

.github/workflows/stale.yml

@@ -28,7 +28,7 @@ jobs:
         egress-policy: audit
 
     - name: Track and close stale issues/PRs
-      uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8.0.0
+      uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9.0.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-issue-stale: 430
@@ -38,21 +38,15 @@ jobs:
         stale-issue-message: >
           Thank you for contributing to the Bazel repository!
           This issue has been marked as stale since it has not had any activity in the last 1+ years. It will be closed in the next 90
-          days unless any other activity occurs or one of the following labels is added: "not stale", "awaiting-bazeler". Please reach out
-          to the triage team (`@bazelbuild/triage`) if you think this issue is still relevant or you are interested in getting the
-          issue resolved.
+          days unless any other activity occurs. If you think this issue is still relevant and should stay open, please post any comment here and the issue will no longer be marked as stale.
         close-issue-message: >
-          This issue has been automatically closed due to inactivity. If you're still interested in pursuing this, please reach out
-          to the triage team (`@bazelbuild/triage`). Thanks!
+          This issue has been automatically closed due to inactivity. If you're still interested in pursuing this, please post `@bazelbuild/triage` in a comment here and we'll take a look. Thanks!
         stale-pr-message: >
           Thank you for contributing to the Bazel repository!
           This pull request has been marked as stale since it has not had any activity in the last 1+ years. It will be closed in the next
-          90 days unless any other activity occurs or one of the following labels is added: "not stale", "awaiting-review", "awaiting-PR-merge".
-          Please reach out to the triage team (`@bazelbuild/triage`) if you think this PR is still relevant or you are interested in getting the
-          PR merged.
+          90 days unless any other activity occurs. If you think this PR is still relevant and should stay open, please post any comment here and the PR will no longer be marked as stale.
         close-pr-message: >
-          This pull request has been automatically closed due to inactivity. If you're still interested in pursuing this, please reach out
-          to the triage team (`@bazelbuild/triage`). Thanks!
+          This pull request has been automatically closed due to inactivity. If you're still interested in pursuing this, please post `@bazelbuild/triage` in a comment here and we'll take a look. Thanks!
         stale-issue-label: 'stale'
         exempt-issue-labels: 'not stale,awaiting-bazeler,untriaged,P0,P1,P2,good first issue,help wanted'
         close-issue-reason: "not_planned"

MODULE.bazel

@@ -23,7 +23,7 @@ bazel_dep(name = "zstd-jni", version = "1.5.2-3.bcr.1")
 bazel_dep(name = "blake3", version = "1.3.3.bcr.1")
 bazel_dep(name = "zlib", version = "1.3")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "7.3.1")
+bazel_dep(name = "rules_java", version = "7.3.2")
 bazel_dep(name = "rules_graalvm", version = "0.10.3")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
 bazel_dep(name = "rules_jvm_external", version = "5.2")
@@ -281,6 +281,15 @@ use_repo(
 cc_configure = use_extension("@bazel_tools//tools/cpp:cc_configure.bzl", "cc_configure_extension")
 use_repo(cc_configure, "local_config_cc")
 
+gvm = use_extension("@rules_graalvm//:extensions.bzl", "graalvm")
+gvm.graalvm(
+    name = "graalvm",
+    distribution = "ce",
+    java_version = "20",
+    version = "20.0.2",
+)
+use_repo(gvm, "graalvm_toolchains")
+
 # =========================================
 # Other Bazel testing dependencies
 # =========================================
@@ -299,17 +308,6 @@ use_repo(bazel_rbe_deps, "rbe_ubuntu2004_java11")
 remote_coverage_tools_extension = use_extension("//tools/test:extensions.bzl", "remote_coverage_tools_extension")
 use_repo(remote_coverage_tools_extension, "remote_coverage_tools")
 
-gvm = use_extension("@rules_graalvm//:extensions.bzl", "graalvm")
-gvm.graalvm(
-    name = "graalvm",
-    distribution = "ce",
-    java_version = "20",
-    version = "20.0.2",
-)
-use_repo(gvm, "graalvm_toolchains")
-
-register_toolchains("@graalvm_toolchains//:gvm")
-
 # =========================================
 # Register platforms & toolchains
 # =========================================
@@ -322,6 +320,8 @@ register_toolchains("@local_config_winsdk//:all")
 
 register_toolchains("//src/main/res:empty_rc_toolchain")
 
+register_toolchains("@graalvm_toolchains//:gvm")
+
 # =========================================
 # Android tools dependencies
 # =========================================