Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bazelbuild/bazel
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6.1.1
Choose a base ref
...
head repository: bazelbuild/bazel
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6.1.2
Choose a head ref
  • 5 commits
  • 21 files changed
  • 7 contributors

Commits on Apr 11, 2023

  1. Bazel CI: Temporarily disable GitRepositoryBlackBoxTest (#18045)

    Workaround for #17447
    
    PiperOrigin-RevId: 508079185
    Change-Id: Ia0b6fc478d0ce32241a2da3aae05c22e045db88a
    
    Co-authored-by: Googler <fwe@google.com>
    keertk and fweikert authored Apr 11, 2023

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    angerman Moritz Angermann
    Copy the full SHA
    c0ae7be View commit details
  2. Patch zlib to fix compatibility with latest Xcode (#18039)

    Fixes #17956
    
    Partial commit for third_party/*, see #17987.
    
    Closes #17987
    
    Signed-off-by: Yun Peng <pcloudy@google.com>
    Co-authored-by: Yun Peng <pcloudy@google.com>
    ShreeM01 and meteorcloudy authored Apr 11, 2023

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    angerman Moritz Angermann
    Copy the full SHA
    de749dd View commit details

Commits on Apr 13, 2023

  1. Turn applicable_licenses on platforms into a no-op. (#18082)

    Backport of Ic12306f5a405c88bd65acf3b8ec419328ce663f3
    aiuto authored Apr 13, 2023
    Copy the full SHA
    906812c View commit details

Commits on Apr 14, 2023

  1. Use ctime in file digest cache key (#18101)

    File digests are now additionally keyed by ctime for supported file system implementations. Since Bazel has a non-zero default for `--cache_computed_file_digests`, this may be required for correctness in cases where different files have identical mtime and inode number. For example, this can happen on Linux when files are extracted from a tar file with fixed mtime and are then replaced with `mv`, which preserves inodes.
    
    Since Java (N)IO doesn't have support for reading file ctimes on Windows, a new method backed by a native implementation is added to `WindowsFileOperation`. Adding a call to this function to `stat` uncovered previously silent bugs where Unix-style `PathFragment`s were created on Windows:
    
    1. Bzlmod's `createLocalRepoSpec` did not correctly extract the path from a registry's `file://` URI on Windows.
    2. `--package_path` isn't usable with absolute paths on Windows as it splits on `:`. Since the flag is deprecated, this commit fixes the tests rather than the implementation.
    
    Fixes #14723
    
    Closes #18003.
    
    PiperOrigin-RevId: 524297459
    Change-Id: I96bfc0210e2f71bf8603c7b7cc5eb06a04048c85
    
    Co-authored-by: Fabian Meumertzheim <fabian@meumertzhe.im>
    keertk and fmeum authored Apr 14, 2023
    Copy the full SHA
    05984b9 View commit details

Commits on Apr 18, 2023

  1. Release 6.1.2 (2023-04-18)

    Baseline: d60ce2c
    
    Cherry picks:
    
       + 490f8ba:
         kshyanashree is the release manager of 6.0.0
       + 4e66d93:
         Automated rollback of commit
         2a28909.
       + 48a8d01:
         Allow C/C++ coverage collection for external targets
       + ec7be34:
         Temporarily set parent directory of the input to writable if it
         is not.
       + b098434:
         Infer CPUs for tvOS and watchOS when on Apple Silicon
       + 5cea7dd:
         Improve the documentation for ctx.actions.symlink.
       + a82d26f:
         Add quotes to "Tip"
       + 75b0f3a:
         Write a repo mapping manifest in the runfiles directory (#16555)
       + 07c5c1a:
         Ensure repository names don't start with `~`
       + 30f6c82:
         Escape tilde more gracefully
       + cf3f48c:
         Relax `Label` repo visibility validation
       + 4477823:
         Use "apparent name" instead of "local name" in Bzlmod docs
       + 55f4f48:
         Bazel DevSite: Add required css file.
       + a706994:
         Remove logic that increases delay between progress updates over
         time
       + 1d514ab:
         Remove references to io_bazel repository
       + b0357bd:
         Relnotes python script
       + 8f95651:
         Allow Java coverage collection for external targets
       + bddb191:
         Fix race condition in package-bazel.sh
       + a757852:
         Decanonicalize labels emitted by {a,c,}query if possible
       + 9d250ed:
         Add uniquify parameter to TemplateDict.add_joined
       + f02bcf8:
         Fix identical gcov json file name problem
       + a159330:
         Add `$(rlocationpath(s) ...)` expansion
       + 56f54da:
         Rollup of SBOM correctness fixes (#16655)
       + 72e6e94:
         [cc] Add cc toolchain to starlark cc_proto_library (#16661)
       + 8f28513:
         Make C++ runfiles library repo mapping aware
       + 95f9adc:
         Always collect FileProvider's filesToBuild as data runfiles
       + 4959d34:
         fix: export constraints.bzl file from @local_config_platform so
         it can be used in downstream bzl_library targets
       + 4919d4a:
         Add --host_per_file_copt (#16695)
       + 0a23d46:
         Moving some tests for `RemoteActionFileSystem` of BwoB to a base
         class.
       + 9296068:
         [remote/downloader] Don't include headers in `FetchBlobRequest`
       + 128d833:
         [remote] Respect whether the server supports action cache updates
       + 38c5019:
         [remote/downloader] Migrate `Downloader` to take `Credentials`
         (#16732)
       + 5929cb7:
         Stage repository mapping manifest as a root symlink (#16733)
       + 455454a:
         Expose current repository name to Java with @AutoBazelRepository
       + 97dea59:
         Implement getDirectoryEntries and readdir for
         RemoteActionFileSystem.
       + aa45f5f:
         Move integration tests for BwoB to a base class and add more
         tests there.
       + 1b073ac:
         Make Java runfiles library repo mapping aware
       + 148bbb1:
         Use `_repo_mapping` in C++ runfiles library (#16752)
       + 25558ad:
         Add --experimental_action_cache_store_output_metadata to the
         expansio…
       + 6e945e8:
         Treat `DEBUG` events as progress-like.
       + 1940c5d:
         redact 'token' strings from logging
       + 0b64525:
         Make Bash runfiles library repo mapping aware (#16753)
       + 4caae75:
         Automated rollback of commit
         8f95651.
       + 13ff6d9:
         Fix Bash rlocation failure with stricter Bash options
       + bd88c7e:
         Make bazel Android remote deps compatible with bzlmod (#16772)
       + 6f6d4cc:
         Flip `--incompatible_always_include_files_in_data`
       + 94355b1:
         Add required `--add-opens` server JVM args also with
         non-embedded JDK
       + 8349c95:
         Also collect clang resource directory with
         `-no-canonical-prefixes`
       + dce6ed7:
         Make `bazel run` works with minimal mode
       + ca8674c:
         Include source files with `cquery --output=files` (#16826)
       + 9cb5e0a:
         Fsync before rename after copy in DiskCacheClient
       + 23ffce5:
         Update GetActionResult for disk cache to check referenced files
         when …
       + 0bc0ff5:
         Make Java runfiles library compilable with JDK 8
       + fe16965:
         [6.0.0] Default --incompatible_strict_conflict_checks to true.
         (#16864)
       + 99ca86f:
         Revert "[6.0.0] Default --incompatible_strict_conflict_checks to
         true. (#16864)" (#16872)
       + 312238f:
         Make C++ runfiles library build with `-Werror=shadow`
       + 2baa5a4:
         Keep credentials cached across build commands.
       + 8818a57:
         [6.0.0] Only inject metadata for outputs that cannot be
         reconstructed by skyf… (#16879)
       + 31e4bf4:
         Update java_tools v11.9
       + cd40666:
         replace _get_canonical_form(label) with str(label)
       + e2bc237:
         Avoid exceptions from hermetic sandbox for unsupported artifact
         subclasses
       + b564d14:
         Remove warnings about ignored starlark options
       + 7ccc661:
         [6.0.0] Emit Tree objects in topological order (#16904)
       + 86dee6d:
         Correctly match regex with tree artifact
       + 14925b5:
         Always use target's attributes to set Python version (#16959)
       + a247502:
         Add 'toolchain' parameter to actions.{run,run_shell}
       + 497b7e4:
         Fix Bash `runfiles_current_repository` with RBE
       + 0a2c4ed:
         Fix corner cases in Bash runfiles library
       + 33b514b:
         Fix runfiles creation with MANIFEST when building without the
         bytes
       + 3a13af4:
         Remove LCOV merger dependency of `cc_test` without coverage
         (#17004)
       + 25ba76c:
         Include full tree artifact in inputs when prefetcher doesn't
         support partial tree artifacts.
       + 06deebf:
         Release 6.0.0 (2022-12-19)
       + c2bfb2e:
         Enable git_submodules tests and merge git_repository and
         starlark_git_repository (#17247)
       + e8182ce:
         have 'bazel test' non-test targets depend on
         --remote_download_output
       + c3245cd:
         Add `SpellChecker` suggestions for common Bzlmod errors
       + 8ec8743:
         Use xcrun to invoke install_name_tool
       + 2b2bea4:
         Extra resources
       + 5b4de12:
         Do not clear `--platforms` on no-op change to `--cpu`
       + db3c013:
         Report `AspectCreationException` to the user
       + 53e9fea:
         Use long executable path instead of `argv[0]` in all launchers
       + abae5ca:
         Add sanitizer features to unix_cc_toolchain_config
       + db68419:
         Allow `map_each` to return `None` in `TemplateDict#add_joined`
       + 66b58ee:
         Always emit trailing zero in human-readable download progress
       + 17b8e44:
         Upload all logs in BEP even with minimal upload
       + 28d2daa:
         Set `--experimental_action_listeners` to default in `exec` config
       + 16427c9:
         Do not count tests as failed that have not started
       + 094a0aa:
         Accept tildes in --override_module
       + 5f2866f:
         Do the AC integrity check for disk part of the combined cache.
       + cd10d50:
         Fix `--nozip_undeclared_test_outputs` on Windows
       + 073f54b:
         Allow pyd in extensions of dynamic libraries
       + ac504cb:
         Register JavaCompileActionContext in Bazel.
       + f090433:
         Rollback #14510 because it causes remote test execution to fail
       + 942ddda:
         Prepare backwards compatible usage of optional C++ toolchain
       + 88b51f5:
         Emit LLVM coverage for source file paths with a `tmp` segment
       + bb0b886:
         Enable archive_param_file feature by default for Windows
       + baf97c0:
         Allow `TemplateDict#map_each` callback to return a list of
         strings (#17306)
       + fcb0077:
         Only try to create groups of test actions in the ui.
       + 3c47b47:
         Find `libtool` when using `BAZEL_USE_CPP_ONLY_TOOLCHAIN`.
       + 1da8a82:
         Add -dead_strip in default opt link flags for darwin
       + b0c5eb3:
         Dont query remote cache but always use bytestream protocol
       + 00e9af1:
         Allow Java coverage collection for external targets.
       + dd24a00:
         Test and fix root symlink edge case in runfiles library
       + af97d98:
         [6.1.0] Fix broken CI (#17422)
       + b859571:
         Add `native.package_relative_label` function
       + 82168d4:
         Make Bazel more responsive and use less memory when --jobs is
         high (#17398)
       + 84c1ed4:
         Multiplex worker fixes and tests for Android busybox tools
         (#17371)
       + 0759081:
         Improve error message for concurrent modifications (#17396)
       + 27bc896:
         [6.1.0] Make bazel coverage work with minimal mode (#17397)
       + 544b816:
         [6.1.0] Fix cc_binary bug related to cc_shared_library on
         Windows and prepare for future removal of
         --experimental_cc_shared_library flag (#17445)
       + 9a7aa21:
         Fix Bash `runfiles_current_repository` for tools
       + 911eedc:
         Fix label unambiguous canonical form to correctly report
         non-visible repo names
       + e132653:
         Remove O1 from sanitizer feature flag defaults
       + ba9e2f8:
         Remove usage of gRPC Context cancellation in the remote
         execution client.
       + de03a23:
         Allow -v to libtool
       + 4e35c02:
         Prettify labels in action progress messages with Bzlmod (#17278)
       + 1be0ac3:
         Expand tree outputs before eagerly prefetching them for local
         actions. (#17494)
       + c266651:
         Fix Java coverage collection with Java 8 runtime
       + 1a6ffe6:
         Add a flag to disable execution log sorting.
       + fbec8e2:
         Reduce flakiness on Windows for BwoB tests
       + 420659a:
         Make AutoBazelRepositoryProcessor compatible with Java 8
       + dde6d20:
         Do not recommend `shallow_since` for `git_repository`
       + f76fc61:
         Allow the timeout value for execute calls on a mac to be set via
         an environment variable
       + 773d232:
         Fix RPATHs for cc toolchain solib when sibling layout is used
       + 5932b3b:
         [6.1.0] Add --host_features (#17528)
       + a0fa77c:
         Exit with code 39 if remote cache evicted blobs that Bazel need
         during an invocation (#17496)
       + 1a438b4:
         Only fetch @remote_coverage_tools when collecting coverage
         (#17512)
       + ee1daaf:
         [6.1.0]Only fetch @remote_coverage_tools when collecting
         coverage (#17287)
       + 350e329:
         [6.1.0]Fix symlink file creation overhead (#17488)
       + 5406c95:
         [6.1.0] Cleanup stale state when remote cache evicted (#17538)
       + 2d1b570:
         Bump version number in runfiles.bash init code
       + 3ab8a0a:
         [6.1.0]Let `aquery` print effective environment for all
         `CommandAction`s (#17274)
       + 51e6c38:
         Properly report repo fetch progress during main repo mapping
         computation
       + 744108e:
         [docs] Update migrating to Xcode tutorial (#17563)
       + 9dc7a7e:
         Update //third_party:jsr305 (#17557)
       + 43dadb2:
         Bump minimum supported macOS versions to 10.13
       + 7d9d23c:
         Correctly set default subprocess factory when loading class
         `SubprocessBuilder`.
       + 77f82f4:
         Add an --incompatible_strict_conflict_checks alias for
         --experimental_strict_conflict_checks.
       + e05345d:
         Add support for wrapping system streams in WorkRequestHandler
       + 68e1924:
         Also handle remote cache eviction for tree artifacts. (#17601)
       + 4a6d056:
         Add host transition to lcov_merger in Java version of py_test
       + 546e9e2:
         Fix Bazel 6.0 crash regression (#17613)
       + 7e328bb:
         Include Bazel version information in profile metadata. (#17616)
       + aafe123:
         [6.1.0] Handle remote cache eviction when uploading inputs for
         remote actions. (#17605)
       + 938e348:
         [6.1.0] Rerun the artifact conflict check when
         --incompatible_strict_conflict_checks changes. (#17592)
       + 034a281:
         Report background download for BwoB (#17619)
       + 5afbce5:
         [6.1.0] Flag for writable outputs (experimental) (#17617)
       + d4105e6:
         [6.1.0] Allow .wasm cc executable and dynamic library extension
         (#17440)
       + a306f4f:
         make desugar dependencies deterministic
       + 37953c5:
         Apply exec transition to lcov_merger in sh_test and cc_test
       + 1d73d72:
         [6.1.0]Fix --host_features with multiple transitions (#17641)
       + 755cd4b:
         Release 6.1.0 (2023-03-06)
       + 885ae7e:
         Revert "Add -dead_strip in default opt link flags for darwin
         (#17312)" (#17696)
       + e7fd4cf:
         Fix wasm dynamic library extension crash (#17757)
       + 1a90fe5:
         Release 6.1.1 (2023-03-15)
       + c0ae7be:
         Bazel CI: Temporarily disable GitRepositoryBlackBoxTest (#18045)
       + 1f2b3ed:
         Patch zlib to fix compatibility with latest Xcode
       + 906812c:
         Turn applicable_licenses on platforms into a no-op. (#18082)
       + 05984b9:
         Use ctime in file digest cache key (#18101)
    
    Incompatible changes:
    
      - Bazel no longer increases the delay between progress updates when
        there is no cursor control.
      - `--incompatible_always_include_files_in_data` is flipped
        to true. See #16654 for
        details.
      - `cquery --output=files` also outputs source files.
    
        Closes #16602.
      - `--incompatible_strict_conflict_checks` is flipped to true. See
        #16729 for details.
      - This changes the behavior of Python version in exec/host
        configuration. Mitigation is to set Python version on the targets.
      - `--features` only applies to targets built in the target
        configuration, and `--host_features` is used for the host / exec
        configuration (gated behind `--incompatible_use_host_features`)
    
        Fixes #13839
    
        Closes #16626.
    
    Important changes:
    
      - The new path variable `$(rlocationpath ...)` and its plural form
        `$(rlocationpaths ...)` can be used to expand labels to the paths
        accepted by the `Rlocation` function of runfiles libraries. This
        is the preferred way to access data dependencies at runtime and
        works on all platforms, even when runfiles are not enabled (e.g.,
        on Windows by default).
    
        Work towards #16124
        Fixes #10923
    
        Closes #16428.
      - Starlark `print()` statements are now emitted iff the line of
        code is executed. They are no longer replayed on subsequent
        invocations unless the Starlark code is re-executed.
        Additionally, multiple identical `print()` statements (same
        string from the same line of code, e.g. from a loop) are all
        emitted and no longer deduplicated.
      - Fixes a bug where some compilation flags would not be applied to
        a cc_test
      - Added a `native.package_relative_label()` function, which
        converts a label string to a Label object in the context of the
        calling package, in contrast to `Label()`, which does so in the
        context of the current .bzl file. Both functions now also accept
        relative labels such as `:foo`, and are idempotent.
    
    This release contains contributions from many people at Google, as well as Brentley Jones, Ezekiel Warren, Fabian Meumertzheim, keertk, Keith Smiley, Krzysztof Naglik, kshyanashree, lunch-glide-pepper, oquenchil, Ted Kaplan, Ted Kaplan, UebelAndre, Xùdōng Yáng, Yannic, yuzhy8701.
    Bazel Release System authored and keertk committed Apr 18, 2023
    Copy the full SHA
    a4d8764 View commit details
6 changes: 6 additions & 0 deletions .bazelci/postsubmit.yml
Original file line number Diff line number Diff line change
@@ -214,6 +214,12 @@ tasks:
- "-//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
6 changes: 6 additions & 0 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
@@ -207,6 +207,12 @@ tasks:
- "-//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"
windows:
shards: 4
batch_commands:
Loading