Merge branch 'master' of https://github.com/tylerwilliams/bazel into …

…b3hasher2
bazelbuild · Jul 6, 2023 · f285a96 · f285a96
2 parents d6cc1a5 + c886a67
commit f285a96
Show file tree

Hide file tree

Showing 305 changed files with 13,503 additions and 6,137 deletions.
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
@@ -87,6 +87,7 @@ tasks:
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_tag_filters=-no_1804"
       # Configure and enable tests that require access to the network.
       - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
     test_targets:
@@ -138,6 +139,7 @@ tasks:
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_tag_filters=-no_1804"
     test_targets:
       - "//src/test/shell/bazel:cc_integration_test"
     include_json_profile:
@@ -311,8 +313,6 @@ tasks:
       - "-//src/test/java/com/google/devtools/build/lib/skyframe/rewinding:RewindingTest"
       - "-//src/test/java/com/google/devtools/build/lib/buildtool:MiscAnalysisTest"
       - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      # https://github.com/bazelbuild/bazel/issues/16975
-      - "-//scripts/docs:rewriter_test"
       # https://github.com/bazelbuild/bazel/issues/17007
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
     include_json_profile:
@@ -340,6 +340,7 @@ tasks:
       - "--host_copt=-w"
       - "--test_tag_filters=-no_windows,-slow"
       - "--test_env=JAVA_HOME"
+      - "--test_env=BAZEL_VC"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest_install_base"
       - "--test_env=TEST_REPOSITORY_HOME=C:/b/bazeltest_external"
     test_targets:
@@ -403,6 +404,7 @@ tasks:
       - "--experimental_remote_download_outputs=minimal"
       - "--experimental_inmemory_jdeps_files"
       - "--experimental_inmemory_dotd_files"
+      - "--test_tag_filters=-no_1804"
     test_targets:
       - "//scripts/..."
       - "//src/java_tools/..."

diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -50,6 +50,7 @@ tasks:
       - "//third_party/ijar/..."
       - "//tools/android/..."
       - "//tools/aquery_differ/..."
+      - "//tools/compliance/..."
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/buildjar/..."
@@ -91,6 +92,7 @@ tasks:
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_tag_filters=-no_1804"
       # Configure and enable tests that require access to the network.
       - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
     test_targets:
@@ -142,6 +144,7 @@ tasks:
       - "--sandbox_writable_path=$HOME/bazeltest"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
       - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_tag_filters=-no_1804"
     test_targets:
       - "//src/test/shell/bazel:cc_integration_test"
     include_json_profile:
@@ -322,8 +325,6 @@ tasks:
       - "-//src/test/java/com/google/devtools/build/lib/skyframe/rewinding:RewindingTest"
       - "-//src/test/java/com/google/devtools/build/lib/buildtool:MiscAnalysisTest"
       - "-//src/test/java/com/google/devtools/build/lib/rules/objc:ObjcRulesTests"
-      # https://github.com/bazelbuild/bazel/issues/16975
-      - "-//scripts/docs:rewriter_test"
       # https://github.com/bazelbuild/bazel/issues/17007
       - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
       # Disable the most time-consuming tests on macOS arm64 platform in presubmit.
@@ -406,6 +407,7 @@ tasks:
       - "--host_copt=-w"
       - "--test_tag_filters=-no_windows,-slow"
       - "--test_env=JAVA_HOME"
+      - "--test_env=BAZEL_VC"
       - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest_install_base"
       - "--test_env=TEST_REPOSITORY_HOME=C:/b/bazeltest_external"
     test_targets:
@@ -471,6 +473,7 @@ tasks:
       - "--experimental_remote_cache_async"
       - "--experimental_remote_merkle_tree_cache"
       - "--remote_download_minimal"
+      - "--test_tag_filters=-no_1804"
     test_targets:
       - "//scripts/..."
       - "//src/java_tools/..."

diff --git a/.github/ISSUE_TEMPLATE/mirror_request.yml b/.github/ISSUE_TEMPLATE/mirror_request.yml
@@ -9,12 +9,11 @@ body:
   - type: markdown
     attributes:
       value: >
-        **Attention:** if the archive you're trying to mirror is a GitHub release archive,
-        please use URLs of the form `https://github.com/$USER/$REPO/archive/refs/tags/$TAG`,
-        instead of the form without the `refs/tags/` part. The latter is *not* guaranteed to
-        have a stable hash (see
-        https://github.com/bazel-contrib/SIG-rules-authors/issues/11#issuecomment-1029861300
-        for more details).
+        **Attention:** if the archive you're trying to mirror is from GitHub,
+        please use URLs in the form of `https://github.com/$USER/$REPO/releases/download/...` if available.
+        If you are the project maintainer, you should create and upload such an release archive.
+        GitHub doesn't guarantee a stable checksum of source archives in the form of `https://github.com/<org>/<repo>/archive/...`, which are generated on demand.
+        Check [GitHub Archive Checksum Outage](https://blog.bazel.build/2023/02/15/github-archive-checksum.html) for more details.
   - type: textarea
     id: urls
     attributes:

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -33,11 +33,11 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-issue-stale: 430
         days-before-pr-stale: 430
-        days-before-issue-close: 14
-        days-before-pr-close: 14
+        days-before-issue-close: 90
+        days-before-pr-close: 90
         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 14
+          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.
@@ -47,17 +47,17 @@ jobs:
         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
-          14 days unless any other activity occurs or one of the following labels is added: "not stale", "awaiting-review", "awaiting-PR-merge".
+          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.
         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!
         stale-issue-label: 'stale'
-        exempt-issue-labels: 'not stale,awaiting-bazeler,untriaged,P0,P1'
+        exempt-issue-labels: 'not stale,awaiting-bazeler,untriaged,P0,P1,P2,good first issue,help wanted'
         close-issue-reason: "not_planned"
         stale-pr-label: 'stale'
-        exempt-pr-labels: 'not stale,awaiting-review,awaiting-PR-merge,P0,P1'
+        exempt-pr-labels: 'not stale,awaiting-review,awaiting-PR-merge,P0,P1,P2'
         exempt-draft-pr: true
         operations-per-run: 500
         ascending: true
diff --git a/BUILD b/BUILD
@@ -181,6 +181,11 @@ pkg_tar(
     visibility = ["//:__subpackages__"],
 )
 
+exports_files(
+    ["maven_install.json"],
+    visibility = ["//tools/compliance:__pkg__"],
+)
+
 py_binary(
     name = "combine_distfiles",
     srcs = ["combine_distfiles.py"],

diff --git a/WORKSPACE b/WORKSPACE
@@ -473,14 +473,13 @@ maven_install(
         "io.netty:netty-transport-native-unix-common:jar:linux-x86_64:4.1.93.Final",
         "io.netty:netty-transport-native-unix-common:jar:osx-aarch_64:4.1.93.Final",
         "io.netty:netty-transport-native-unix-common:jar:osx-x86_64:4.1.93.Final",
-        "io.netty:netty-transport-sctp:4.1.93.Final",
         "io.netty:netty-transport:4.1.93.Final",
         "io.reactivex.rxjava3:rxjava:3.1.2",
         "javax.activation:javax.activation-api:1.2.0",
         "javax.annotation:javax.annotation-api:1.3.2",
         "javax.inject:javax.inject:1",
-        "net.bytebuddy:byte-buddy-agent:1.11.13",
-        "net.bytebuddy:byte-buddy:1.11.13",
+        "net.bytebuddy:byte-buddy-agent:1.14.5",
+        "net.bytebuddy:byte-buddy:1.14.5",
         "org.apache.commons:commons-compress:1.19",
         "org.apache.commons:commons-pool2:2.8.0",
         "org.apache.tomcat:tomcat-annotations-api:8.0.5",
@@ -559,7 +558,8 @@ maven_install(
         "com.google.protobuf:protobuf-java",
         "com.google.protobuf:protobuf-javalite",
     ],
-    fail_if_repin_required = False,
+    # Don't forget to change this to back to True before submitting your change.
+    fail_if_repin_required = True,
     maven_install_json = "//:maven_install.json",
     repositories = [
         "https://repo1.maven.org/maven2",
@@ -583,6 +583,7 @@ maven_install(
         "com.android.tools:common:30.1.3",
         "com.android.tools:repository:30.1.3",
     ],
+    # Don't forget to change this to back to True before submitting your change.
     fail_if_repin_required = True,
     maven_install_json = "//src/tools/android:maven_android_install.json",
     repositories = [

diff --git a/maven_install.json b/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -482172833,
-  "__RESOLVED_ARTIFACTS_HASH": -552166642,
+  "__INPUT_ARTIFACTS_HASH": 307745718,
+  "__RESOLVED_ARTIFACTS_HASH": -1204291120,
   "artifacts": {
     "aopalliance:aopalliance": {
       "shasums": {
@@ -475,12 +475,6 @@
       },
       "version": "4.1.93.Final"
     },
-    "io.netty:netty-transport-sctp": {
-      "shasums": {
-        "jar": "9021704f3ad2758d3d2728d335fcd16df8390bbcd9cfb64ee24e2024d4cd5a0f"
-      },
-      "version": "4.1.93.Final"
-    },
     "io.opencensus:opencensus-api": {
       "shasums": {
         "jar": "f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382"
@@ -537,15 +531,15 @@
     },
     "net.bytebuddy:byte-buddy": {
       "shasums": {
-        "jar": "e29fa75b903432ac64d05c18c19d0e3b9026e74abda52bbd6f9065e55f4a29f5"
+        "jar": "e99761a526df0fefbbd3fe14436b0f953000cdfa5151dc63c0b18d37d9c46f1c"
       },
-      "version": "1.11.13"
+      "version": "1.14.5"
     },
     "net.bytebuddy:byte-buddy-agent": {
       "shasums": {
-        "jar": "49b43b0d10f8bb1d800d56137bdf0f44628412ebe1fbd804e45f363d495860fa"
+        "jar": "55f19862b870f5d85890ba5386b1b45e9bbc88d5fe1f819abe0c788b4929fa6b"
       },
-      "version": "1.11.13"
+      "version": "1.14.5"
     },
     "org.apache.commons:commons-compress": {
       "shasums": {
@@ -603,15 +597,15 @@
     },
     "org.mockito:mockito-core": {
       "shasums": {
-        "jar": "75d4b14ba7aef836e92ba7b2d53ca7d6b215dd7db5625afbc39252f1358835fe"
+        "jar": "b1689b06617ea01fd777bfaedbdde512faf083d639a049f79b388d5a4e96d2e5"
       },
-      "version": "3.12.4"
+      "version": "5.4.0"
     },
     "org.objenesis:objenesis": {
       "shasums": {
-        "jar": "03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3"
+        "jar": "02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb"
       },
-      "version": "3.2"
+      "version": "3.3"
     },
     "org.ow2.asm:asm": {
       "shasums": {
@@ -1062,12 +1056,6 @@
       "io.netty:netty-common",
       "io.netty:netty-transport"
     ],
-    "io.netty:netty-transport-sctp": [
-      "io.netty:netty-buffer",
-      "io.netty:netty-codec",
-      "io.netty:netty-common",
-      "io.netty:netty-transport"
-    ],
     "io.opencensus:opencensus-api": [
       "io.grpc:grpc-context"
     ],
@@ -1652,12 +1640,6 @@
     "io.netty:netty-transport-native-unix-common:jar:osx-x86_64": [
       "io.netty.channel.unix"
     ],
-    "io.netty:netty-transport-sctp": [
-      "io.netty.channel.sctp",
-      "io.netty.channel.sctp.nio",
-      "io.netty.channel.sctp.oio",
-      "io.netty.handler.codec.sctp"
-    ],
     "io.opencensus:opencensus-api": [
       "io.opencensus.common",
       "io.opencensus.internal",
@@ -1802,11 +1784,13 @@
       "net.bytebuddy.pool",
       "net.bytebuddy.utility",
       "net.bytebuddy.utility.dispatcher",
+      "net.bytebuddy.utility.nullability",
       "net.bytebuddy.utility.privilege",
       "net.bytebuddy.utility.visitor"
     ],
     "net.bytebuddy:byte-buddy-agent": [
-      "net.bytebuddy.agent"
+      "net.bytebuddy.agent",
+      "net.bytebuddy.agent.utility.nullability"
     ],
     "org.apache.commons:commons-compress": [
       "org.apache.commons.compress",
@@ -2005,7 +1989,6 @@
       "org.mockito.internal.invocation.finder",
       "org.mockito.internal.invocation.mockref",
       "org.mockito.internal.junit",
-      "org.mockito.internal.junit.util",
       "org.mockito.internal.listeners",
       "org.mockito.internal.matchers",
       "org.mockito.internal.matchers.apachecommons",
@@ -2033,7 +2016,6 @@
       "org.mockito.mock",
       "org.mockito.plugins",
       "org.mockito.quality",
-      "org.mockito.runners",
       "org.mockito.session",
       "org.mockito.stubbing",
       "org.mockito.verification"
@@ -2181,7 +2163,6 @@
       "io.netty:netty-transport-native-unix-common:jar:linux-x86_64",
       "io.netty:netty-transport-native-unix-common:jar:osx-aarch_64",
       "io.netty:netty-transport-native-unix-common:jar:osx-x86_64",
-      "io.netty:netty-transport-sctp",
       "io.opencensus:opencensus-api",
       "io.opencensus:opencensus-contrib-http-util",
       "io.perfmark:perfmark-api",

diff --git a/site/en/_book.yaml b/site/en/_book.yaml
@@ -130,6 +130,8 @@ upper_tabs:
         path: /external/registry
       - title: Module extensions
         path: /external/extension
+      - title: Bzlmod migration guide
+        path: /external/migration
       - title: Advanced topics
         path: /external/advanced
       - heading: Querying your build

diff --git a/site/en/contribute/support.md b/site/en/contribute/support.md
diff --git a/site/en/docs/_index.yaml b/site/en/docs/_index.yaml
@@ -49,7 +49,7 @@ landing_page:
       Learn about Bazel's release model, latest releases, and compatibility policies.
     items_across: 4
     items:
-    - heading: Release policy
+    - heading: Release model
       path: /release/
     - heading: Backward compatibility
       path: /release/backward-compatibility