diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 33f00215e3..545abc0554 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -1,7 +1,7 @@ # LINT.IfChange(bazelci_presubmit) matrix: platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"] - bazel: [7.x, 8.x] + bazel: [8.x] tasks: verify_targets: diff --git a/.bazeliskrc b/.bazeliskrc index 24409250d5..26244ad388 100644 --- a/.bazeliskrc +++ b/.bazeliskrc @@ -1 +1 @@ -USE_BAZEL_VERSION=7.6.1 +USE_BAZEL_VERSION=8.0.1 diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index ffa3643774..a53c96239b 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -3,7 +3,7 @@ bcr_test_module: module_path: examples matrix: platform: ["debian10", "macos", "macos_arm64", "ubuntu2004", "windows"] - bazel: [7.x, 8.x] + bazel: [8.x] tasks: verify_targets: diff --git a/.github/workflows/test_bazel.yml b/.github/workflows/test_bazel.yml index e6f839f0c6..46669a6aef 100644 --- a/.github/workflows/test_bazel.yml +++ b/.github/workflows/test_bazel.yml @@ -27,7 +27,7 @@ jobs: fail-fast: false matrix: runner: [ ubuntu, windows, macos ] - bazelversion: [ '7.6.1', '8.0.0' ] + bazelversion: [ '8.0.0' ] bzlmod: [ true, false ] toolchain_resolution: # Default flags, uses from-source protoc @@ -87,4 +87,4 @@ jobs: version: ${{ matrix.bazelversion }} bash: > cd examples/example_without_cc_toolchain; - bazel build //... $BAZEL_FLAGS --enable_bzlmod=true ${{ matrix.toolchain_resolution }}; \ No newline at end of file + bazel build //... $BAZEL_FLAGS ${{ matrix.toolchain_resolution }}; diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index 68de376f97..1353975f19 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -44,10 +44,6 @@ jobs: cache_key: Bazel7bzlmod image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604" targets: "//src/... //third_party/utf8_range/..." - - config: { name: "Bazel7 Workspace", flags: --noenable_bzlmod } - cache_key: Bazel7nobzlmod - image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604" - targets: "//src/... //third_party/utf8_range/..." - config: { name: "Bazel8", flags: --cxxopt="-Wno-self-assign-overloaded" } cache_key: Bazel8 image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-e78301df86b3e4c46ec9ac4d98be00e19305d8f3" diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml index edb4b4903e..95fcd076ea 100644 --- a/.github/workflows/test_java.yml +++ b/.github/workflows/test_java.yml @@ -48,11 +48,6 @@ jobs: cache_key: 'bazel7bzlmod' image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 targets: //java/... //java/internal:java_version //compatibility/... - - name: Bazel7 Workspace - cache_key: 'bazel7nobzlmod' - image: us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:7.6.1-e0df73e51131ccaf53451355d22577f377357604 - targets: //java/... //java/internal:java_version //compatibility/... - flags: --noenable_bzlmod # TODO: b/395623141 - restore this test once runtime uses / emulates aarch64. # - name: aarch64 # cache_key: 'aarch64' diff --git a/.github/workflows/test_python.yml b/.github/workflows/test_python.yml index 83bc3074b3..983aca17c2 100644 --- a/.github/workflows/test_python.yml +++ b/.github/workflows/test_python.yml @@ -64,7 +64,7 @@ jobs: if: ${{ !matrix.continuous-only || inputs.continuous-run }} uses: protocolbuffers/protobuf-ci/bazel-docker@v5 with: - image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:7.6.1-{0}-5237f14696e60e4b050edfbf7ba9b374f37f83c6', matrix.version) }} + image: ${{ matrix.image || format('us-docker.pkg.dev/protobuf-build/containers/test/linux/python:8.0.1-{0}-5237f14696e60e4b050edfbf7ba9b374f37f83c6', matrix.version) }} credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: python_linux/${{ matrix.type }}_${{ matrix.version }} bazel: test ${{ matrix.targets }} ${{ matrix.flags }} ${{ matrix.nobzlmod && '--noenable_bzlmod' || '' }} --test_env=KOKORO_PYTHON_VERSION @@ -115,7 +115,7 @@ jobs: env: KOKORO_PYTHON_VERSION: ${{ matrix.version }} with: - version: 7.6.1 # Bazel version + version: 8.0.1 # Bazel version credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }} bazel-cache: python_macos/${{ matrix.type }}_${{ matrix.version }} bazel: >-