diff --git a/.bazelrc b/.bazelrc index ecd54a58a52..ea9b8fd4845 100644 --- a/.bazelrc +++ b/.bazelrc @@ -6,3 +6,13 @@ build --host_javacopt=-g # TODO(ronshapiro): explore how much work it would be to reenable this build --javacopt="-Xep:BetaApi:OFF" build --host_javacopt="-Xep:BetaApi:OFF" + +# Note: This flag is required to prevent actions from clashing with each when +# reading/writing tmp files. Without this flag we get errors like: +# +# Error: Cannot use file /tmp/hsperfdata_runner/12 because it is locked by +# another process +# +# This flag will be enabled by default in Bazel 7.0.0, but for now we enable it +# manually. For more details: https://github.com/bazelbuild/bazel/issues/3236. +build --incompatible_sandbox_hermetic_tmp \ No newline at end of file diff --git a/.bazelversion b/.bazelversion new file mode 100644 index 00000000000..c0be8a7992a --- /dev/null +++ b/.bazelversion @@ -0,0 +1 @@ +6.4.0 \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a18be6594d..f25c9a4160b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,6 @@ env: USE_JAVA_VERSION: '11' # This is required by AGP 8.3+. USE_JAVA_VERSION_FOR_PLUGIN: '17' - # Our Bazel builds currently rely on 6.4.0. The version is set via - # baselisk by USE_BAZEL_VERSION: https://github.com/bazelbuild/bazelisk. - USE_BAZEL_VERSION: '6.4.0' # The default Maven 3.9.0 has a regression so we manually install 3.8.7. # https://issues.apache.org/jira/browse/MNG-7679 USE_MAVEN_VERSION: '3.8.7' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 31ecc66bb78..3bb86d8e447 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,9 +12,6 @@ env: USE_JAVA_VERSION: '11' # This is required by AGP 8.3+. USE_JAVA_VERSION_FOR_PLUGIN: '17' - # Our Bazel builds currently rely on 6.4.0. The version is set via - # baselisk by USE_BAZEL_VERSION: https://github.com/bazelbuild/bazelisk. - USE_BAZEL_VERSION: '6.4.0' DAGGER_RELEASE_VERSION: "${{ github.event.inputs.dagger_release_version }}" # The default Maven 3.9.0 has a regression so we manually install 3.8.7. # https://issues.apache.org/jira/browse/MNG-7679 diff --git a/tools/bazel.rc b/tools/bazel.rc deleted file mode 100644 index 2707c1c3ac6..00000000000 --- a/tools/bazel.rc +++ /dev/null @@ -1,11 +0,0 @@ -# Global bazelrc file (see https://bazel.build/run/bazelrc#global-bazelrc) - -# Note: This flag is required to prevent actions from clashing with each when -# reading/writing tmp files. Without this flag we get errors like: -# -# Error: Cannot use file /tmp/hsperfdata_runner/12 because it is locked by -# another process -# -# This flag will be enabled by default in Bazel 7.0.0, but for now we enable it -# manually. For more details: https://github.com/bazelbuild/bazel/issues/3236. -build --incompatible_sandbox_hermetic_tmp \ No newline at end of file