From 843d0549241aee65eac971dc270bc22c9bf9dc7a Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 2 Sep 2024 05:52:46 -0700 Subject: [PATCH] Bump Bazel versions to 6.5.0 and 7.3.1 PiperOrigin-RevId: 670189739 --- .github/workflows/test_bazel.yml | 4 ++-- .github/workflows/test_cpp.yml | 6 +++--- .github/workflows/test_upb.yml | 8 ++++---- protobuf_deps.bzl | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/test_bazel.yml b/.github/workflows/test_bazel.yml index 081fedcdfc8f..b8ce45c60a16 100644 --- a/.github/workflows/test_bazel.yml +++ b/.github/workflows/test_bazel.yml @@ -27,11 +27,11 @@ jobs: fail-fast: false matrix: runner: [ ubuntu, windows, macos ] - bazelversion: [ '7.1.2' ] + bazelversion: [ '7.3.1' ] bzlmod: [true, false ] include: - runner: ubuntu - bazelversion: '6.4.0' + bazelversion: '6.5.0' # Not running Bazel 6 with bzlmod, because it doesn't support use_repo_rule in rules_jvm_external bzlmod: false continuous-only: true diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index 19a16eaf8f93..b6e88ff0f557 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -362,7 +362,7 @@ jobs: os: macos-12 cache_key: macos-12-bazel7 bazel: test //src/... //third_party/utf8_range/... //conformance:conformance_framework_tests - bazel_version: '7.1.2' + bazel_version: '7.3.1' continuous-only: true - name: MacOS Apple Silicon (build only) Bazel os: macos-12 @@ -378,7 +378,7 @@ jobs: os: windows-2022 cache_key: windows-2022-bazel7 bazel: test //src/... @com_google_protobuf_examples//... --test_tag_filters=-conformance --build_tag_filters=-conformance - bazel_version: '7.1.2' + bazel_version: '7.3.1' continuous-only: true name: ${{ matrix.continuous-only && inputs.continuous-prefix || '' }} ${{ matrix.name }} runs-on: ${{ matrix.os }} @@ -395,7 +395,7 @@ jobs: credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel: ${{ matrix.bazel }} bazel-cache: cpp_${{ matrix.cache_key }} - version: ${{ matrix.bazel_version || '6.3.0' }} + version: ${{ matrix.bazel_version || '6.5.0' }} non-linux-cmake: strategy: diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml index 1cb5b63347dc..ea589345f4b7 100644 --- a/.github/workflows/test_upb.yml +++ b/.github/workflows/test_upb.yml @@ -50,7 +50,7 @@ jobs: if: ${{ !matrix.config.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/bazel-docker@v3 with: - image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize:${{ matrix.config.bazel_version || '6.3.0' }}-75f2a85ece6526cc3d54087018c0f1097d78d42b + image: us-docker.pkg.dev/protobuf-build/containers/test/linux/sanitize:${{ matrix.config.bazel_version || '6.5.0' }}-75f2a85ece6526cc3d54087018c0f1097d78d42b credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: upb-bazel bazel: test --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 //bazel/... //benchmarks/... //lua/... //python/... //upb/... //upb_generator/... ${{ matrix.config.flags }} @@ -69,7 +69,7 @@ jobs: - name: Run tests uses: protocolbuffers/protobuf-ci/bazel-docker@v3 with: - image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:12.2-6.3.0-63dd26c0c7a808d92673a3e52e848189d4ab0f17" + image: "us-docker.pkg.dev/protobuf-build/containers/test/linux/gcc:12.2-6.5.0-63dd26c0c7a808d92673a3e52e848189d4ab0f17" credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: "upb-bazel-gcc" bazel: >- @@ -97,7 +97,7 @@ jobs: credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: "upb-bazel-windows" bazel: test --cxxopt=/std:c++17 --host_cxxopt=/std:c++17 //upb/... //upb_generator/... //python/... - version: 6.3.0 + version: 6.5.0 exclude-targets: -//python:conformance_test -//upb/reflection:def_builder_test macos: @@ -124,7 +124,7 @@ jobs: credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: "upb-bazel-macos" bazel: ${{ matrix.config.bazel-command }} --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 ${{ matrix.config.flags }} //bazel/... //benchmarks/... //lua/... //python/... //upb/... //upb_generator/... - version: 6.3.0 + version: 6.5.0 no-python: strategy: diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index 9802bcc3ed07..ef18b6232bc7 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -105,19 +105,19 @@ def protobuf_deps(): major_version_int = int(version_parts[0]) minor_version_int = int(version_parts[1]) - if major_version_int < 6 or (major_version_int == 6 and minor_version_int <= 3): - # Works with Bazel 6.3.0, but not higher + if major_version_int <= 6: + # Version 6.5.2 works both with Bazel >=6.4.0 and Bazel 7 http_archive( name = "rules_java", - url = "https://github.com/bazelbuild/rules_java/releases/download/6.0.0/rules_java-6.0.0.tar.gz", - sha256 = "469b7f3b580b4fcf8112f4d6d0d5a4ce8e1ad5e21fee67d8e8335d5f8b3debab", + url = "https://github.com/bazelbuild/rules_java/releases/download/6.5.2/rules_java-6.5.2.tar.gz", + sha256 = "16bc94b1a3c64f2c36ceecddc9e09a643e80937076b97e934b96a8f715ed1eaa", ) else: - # Version 6.5.2 works both with Bazel 6.4.0 and Bazel 7 + # Works with Bazel 7 http_archive( name = "rules_java", - url = "https://github.com/bazelbuild/rules_java/releases/download/6.5.0/rules_java-6.5.0.tar.gz", - sha256 = "160d1ebf33763124766fb35316329d907ca67f733238aa47624a8e3ff3cf2ef4", + url = "https://github.com/bazelbuild/rules_java/releases/download/7.9.1/rules_java-7.9.1.tar.gz", + sha256 = "e1df5fec7d4dde1f8b0a79d3622b3351552d4c05c9ea1671165351a58493a2c6", ) if not native.existing_rule("proto_bazel_features"):