Merge branch 'master' into yannic-critical-path-bep

Author: Yannic

.bazelci/build_bazel_binaries.yml

@@ -37,9 +37,6 @@ platforms:
     build_flags:
       - "-c"
       - "opt"
-      # TODO(pcloudy): Remove the following flag when we actually use Apple
-      # Silicon machines for macos_arm64 platform
-      - "--cpu=darwin_arm64"
   windows:
     build_flags:
       - "--copt=-w"

.bazelci/postsubmit.yml

@@ -1,5 +1,15 @@
 ---
+matrix:
+  bzlmod_platforms: ["centos7_java11_devtoolset10", "ubuntu2004", "macos", "windows"]
+
 tasks:
+  bzlmod_builds:
+    name: "Bazel Bzlmod build"
+    platform: ${{ bzlmod_platforms }}
+    build_flags:
+      - "--config=bzlmod"
+    build_targets:
+      - "//src:bazel_nojdk"
   centos7_java11_devtoolset10:
     shell_commands:
       - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -158,7 +168,6 @@ tasks:
       - build
       - test
   macos:
-    xcode_version: "13.0"
     shell_commands:
       - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
         android_ndk_repository/android_ndk_repository/' WORKSPACE
@@ -193,10 +202,91 @@ tasks:
       - "//third_party/ijar/..."
       - "//tools/android/..."
       - "//tools/aquery_differ/..."
-      - "//tools/osx/crosstool/..."
       - "//tools/python/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # MacOS does not have cgroups so it can't support hardened sandbox
+      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
+      # https://github.com/bazelbuild/bazel/issues/16526
+      - "-//src/test/shell/bazel:starlark_repository_test"
+      # https://github.com/bazelbuild/bazel/issues/17407
+      - "-//src/test/shell/bazel/apple:bazel_apple_test"
+      # https://github.com/bazelbuild/bazel/issues/17408
+      - "-//src/test/shell/bazel/apple:bazel_objc_test"
+      # https://github.com/bazelbuild/bazel/issues/16526#issuecomment-1415858550
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
+      # https://github.com/bazelbuild/bazel/issues/17410
+      - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
+      # 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"
+      # https://github.com/bazelbuild/bazel/issues/17456
+      - "-//src/test/shell/bazel:bazel_determinism_test"
+      # https://github.com/bazelbuild/bazel/issues/17457
+      - "-//src/test/shell/bazel:jdeps_test"
+    include_json_profile:
+      - build
+      - test
+  macos_arm64:
+    shell_commands:
+      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
+        android_ndk_repository/android_ndk_repository/' WORKSPACE
+      - rm -f WORKSPACE.bak
+      - rm -rf $HOME/bazeltest
+      - mkdir $HOME/bazeltest
+      - ln -sf $OUTPUT_BASE/external $HOME/bazeltest/external
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$OUTPUT_BASE/external"
+      - "--test_env=TEST_REPOSITORY_HOME=$HOME/bazeltest/external"
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
+      - "--noremote_accept_cached"
+    build_targets:
+      - "//src:bazel"
+      - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
+      - "//src/main/java/..."
+    test_flags:
+      - "--sandbox_default_allow_network=false"
+      - "--sandbox_writable_path=$HOME/bazeltest"
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$HOME/bazeltest/external"
+      # Configure and enable tests that require access to the network.
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
+    test_targets:
+      - "//scripts/..."
+      - "//src/test/..."
+      - "//src/tools/execlog/..."
+      - "//src/tools/singlejar/..."
+      - "//src/tools/workspacelog/..."
+      - "//third_party/ijar/..."
+      - "//tools/android/..."
+      - "//tools/aquery_differ/..."
+      - "//tools/python/..."
+      # C++ coverage is not supported on macOS yet.
+      - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # MacOS does not have cgroups so it can't support hardened sandbox
+      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
+      # https://github.com/bazelbuild/bazel/issues/16521
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/tools/android/java/com/google/devtools/build/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
+      # https://github.com/bazelbuild/bazel/issues/16525
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:KeepGoingTest"
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:DanglingSymlinkTest"
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:CompileOneDependencyIntegrationTest"
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:SkymeldBuildIntegrationTest"
+      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
+      - "-//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:
       - build
       - test
@@ -308,6 +398,10 @@ tasks:
       - "-//src/java_tools/import_deps_checker/..."
       # We hit connection timeout error when downloading multiple URLs on RBE, see b/217865760
       - "-//src/test/py/bazel:bazel_module_test"
+      - "-//src/test/py/bazel:bazel_lockfile_test"
+      - "-//src/test/py/bazel:bazel_overrides_test"
+      - "-//src/test/py/bazel:bazel_repo_mapping_test"
+      - "-//src/test/py/bazel:bazel_yanked_versions_test"
       - "-//src/test/shell/bazel:verify_workspace"
     include_json_profile:
       - build

.bazelci/postsubmit_bzlmod.yml

@@ -1,5 +1,15 @@
 ---
+matrix:
+  bzlmod_platforms: ["centos7_java11_devtoolset10", "ubuntu2004", "macos", "windows"]
+
 tasks:
+  bzlmod_builds:
+    name: "Bazel Bzlmod build"
+    platform: ${{ bzlmod_platforms }}
+    build_flags:
+      - "--config=bzlmod"
+    build_targets:
+      - "//src:bazel_nojdk"
   centos7_java11_devtoolset10:
     shards: 4
     shell_commands:
@@ -148,7 +158,6 @@ tasks:
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/import_deps_checker/..."
   macos:
-    xcode_version: "13.0"
     shards: 5
     shell_commands:
       - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -183,13 +192,94 @@ tasks:
       - "//third_party/ijar/..."
       - "//tools/android/..."
       - "//tools/aquery_differ/..."
-      - "//tools/osx/crosstool/..."
       - "//tools/python/..."
       # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
       - "-//src/java_tools/buildjar/..."
       - "-//src/java_tools/import_deps_checker/..."
       # C++ coverage is not supported on macOS yet.
       - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # MacOS does not have cgroups so it can't support hardened sandbox
+      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
+      # https://github.com/bazelbuild/bazel/issues/16526
+      - "-//src/test/shell/bazel:starlark_repository_test"
+      # https://github.com/bazelbuild/bazel/issues/17407
+      - "-//src/test/shell/bazel/apple:bazel_apple_test"
+      # https://github.com/bazelbuild/bazel/issues/17408
+      - "-//src/test/shell/bazel/apple:bazel_objc_test"
+      # https://github.com/bazelbuild/bazel/issues/16526#issuecomment-1415858550
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_head_android_tools"
+      - "-//src/test/shell/bazel/android:android_instrumentation_test_integration_test_with_platforms"
+      # https://github.com/bazelbuild/bazel/issues/17410
+      - "-//src/test/java/com/google/devtools/build/lib/platform:SystemMemoryPressureEventTest"
+      # 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"
+      # https://github.com/bazelbuild/bazel/issues/17456
+      - "-//src/test/shell/bazel:bazel_determinism_test"
+      # https://github.com/bazelbuild/bazel/issues/17457
+      - "-//src/test/shell/bazel:jdeps_test"
+  macos_arm64:
+    shards: 2
+    shell_commands:
+      - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
+        android_ndk_repository/android_ndk_repository/' WORKSPACE
+      - rm -f WORKSPACE.bak
+      - rm -rf $HOME/bazeltest
+      - mkdir $HOME/bazeltest
+      - ln -sf $OUTPUT_BASE/external $HOME/bazeltest/external
+    build_flags:
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$HOME/bazeltest/external"
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
+    build_targets:
+      - "//src:bazel"
+      - "//src:bazel_jdk_minimal"
+      - "//src:test_repos"
+      - "//src/main/java/..."
+    test_flags:
+      - "--sandbox_default_allow_network=false"
+      - "--sandbox_writable_path=$HOME/bazeltest"
+      - "--test_env=TEST_INSTALL_BASE=$HOME/bazeltest/install_base"
+      - "--test_env=TEST_REPOSITORY_HOME=$HOME/bazeltest/external"
+      # Configure and enable tests that require access to the network.
+      - "--test_env=REMOTE_NETWORK_ADDRESS=bazel.build:80"
+    test_targets:
+      - "//scripts/..."
+      - "//src/main/starlark/tests/builtins_bzl/..."
+      - "//src/test/..."
+      - "//src/tools/execlog/..."
+      - "//src/tools/singlejar/..."
+      - "//src/tools/workspacelog/..."
+      - "//third_party/ijar/..."
+      - "//tools/android/..."
+      - "//tools/aquery_differ/..."
+      - "//tools/python/..."
+      # Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/8162
+      - "-//src/java_tools/buildjar/..."
+      - "-//src/java_tools/import_deps_checker/..."
+      # C++ coverage is not supported on macOS yet.
+      - "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
+      # MacOS does not have cgroups so it can't support hardened sandbox
+      - "-//src/test/shell/integration:bazel_hardened_sandboxed_worker_test"
+      # https://github.com/bazelbuild/bazel/issues/16521
+      - "-//src/test/shell/bazel/android/..."
+      - "-//src/tools/android/java/com/google/devtools/build/android/..."
+      - "-//src/test/java/com/google/devtools/build/android/dexer:AllTests"
+      # https://github.com/bazelbuild/bazel/issues/16525
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:KeepGoingTest"
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:DanglingSymlinkTest"
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:CompileOneDependencyIntegrationTest"
+      - "-//src/test/java/com/google/devtools/build/lib/buildtool:SkymeldBuildIntegrationTest"
+      - "-//src/test/java/com/google/devtools/build/lib/rules/objc:BazelJ2ObjcLibraryTest"
+      - "-//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"
   windows:
     shards: 4
     batch_commands:
@@ -298,6 +388,10 @@ tasks:
       - "-//src/java_tools/import_deps_checker/..."
       # We hit connection timeout error when downloading multiple URLs on RBE, see b/217865760
       - "-//src/test/py/bazel:bazel_module_test"
+      - "-//src/test/py/bazel:bazel_lockfile_test"
+      - "-//src/test/py/bazel:bazel_overrides_test"
+      - "-//src/test/py/bazel:bazel_repo_mapping_test"
+      - "-//src/test/py/bazel:bazel_yanked_versions_test"
       - "-//src/test/shell/bazel:verify_workspace"
   kythe_ubuntu2004:
     shell_commands:

.bazelci/presubmit.yml

@@ -3,6 +3,7 @@ common --enable_platform_specific_config
 # Shared configuration flags to build and test Bazel on RBE.
 build:remote_shared --remote_instance_name=projects/bazel-untrusted/instances/default_instance
 build:remote_shared --remote_executor=grpcs://remotebuildexecution.googleapis.com
+build:remote_shared --remote_download_toplevel
 build:remote_shared --remote_timeout=600
 build:remote_shared --google_default_credentials
 build:remote_shared --jobs=100
@@ -16,8 +17,7 @@ build:remote_shared --noexperimental_check_desugar_deps
 build:ubuntu1804_java11 --extra_toolchains=@rbe_ubuntu1804_java11//java:all
 build:ubuntu1804_java11 --crosstool_top=@rbe_ubuntu1804_java11//cc:toolchain
 build:ubuntu1804_java11 --extra_toolchains=@rbe_ubuntu1804_java11//config:cc-toolchain
-build:ubuntu1804_java11 --extra_execution_platforms=//:rbe_ubuntu1804_java11_platform
-build:ubuntu1804_java11 --extra_execution_platforms=//:rbe_ubuntu1804_java11_highcpu_platform
+build:ubuntu1804_java11 --extra_execution_platforms=//:rbe_ubuntu1804_java11_platform,//:rbe_ubuntu1804_java11_highcpu_platform
 build:ubuntu1804_java11 --host_platform=//:rbe_ubuntu1804_java11_platform
 build:ubuntu1804_java11 --platforms=//:rbe_ubuntu1804_java11_platform
 build:ubuntu1804_java11 --config=remote_shared
@@ -28,12 +28,16 @@ build:remote --config=ubuntu1804_java11
 build:macos --macos_minimum_os=10.10
 
 # Enable Bzlmod
-build:bzlmod --experimental_enable_bzlmod
+build:bzlmod --enable_bzlmod
+build:bzlmod --check_direct_dependencies=error
 
 # Enable Java 11 language features (https://github.com/bazelbuild/bazel/issues/14592)
 build --java_language_version=11
 build --tool_java_language_version=11
 
+# Fail if a glob doesn't match anything (https://github.com/bazelbuild/bazel/issues/8195)
+build --incompatible_disallow_empty_glob
+
 # User-specific .bazelrc
 try-import %workspace%/user.bazelrc
 

.bazelrc

@@ -0,0 +1 @@
+6.1.1

.bazelversion

@@ -1,12 +1,18 @@
-name: Bug Report
+name: Bug report
 description: File a bug report
+labels: ["type: bug", "untriaged"]
+assignees:
+  - kshyanashree
+  - sgowroji
 body:
   - type: markdown
     attributes:
       value: >
         **Attention:** if this is a _question_ about how to build / test / query / deploy using
-        Bazel, or a _discussion starter_, send it to [email protected] or discuss on
-        [Bazel Slack](https://slack.bazel.build/) instead!
+        Bazel, or a _discussion starter_, please start a new thread at Bazel's
+        [GitHub Discussions](https://github.com/bazelbuild/bazel/discussions), send it to
+        [email protected], or discuss on [Bazel Slack](https://slack.bazel.build/)
+        instead!
   - type: textarea
     id: desc
     attributes:

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,26 @@
+name: Documentation issue
+description: File a documentation issue (through bazel.build's "report an issue" button)
+labels: ["type: documentation (cleanup)", "untriaged", "team-Documentation"]
+assignees:
+  - kshyanashree
+  - sgowroji
+body:
+  - type: input
+    id: link
+    attributes:
+      label: >
+        Page link:
+  - type: textarea
+    id: desc
+    attributes:
+      label: >
+        Problem description (include actual vs expected text, if applicable):
+  - type: textarea
+    id: location
+    attributes:
+      label: >
+        Where do you see this issue? (include link to specific section of the page, if applicable)
+  - type: textarea
+    id: extras
+    attributes:
+      label: Any other information you'd like to share?