Skip to content

Commit

Permalink
Switch to Bazel 8.0.0
Browse files Browse the repository at this point in the history
With this commit we fully switch to Bazel 8.0.0 as the officially
supported build environment for Mozc.

Closes google#1118.
  • Loading branch information
yukawa committed Dec 24, 2024
1 parent 990c417 commit de99f7b
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: build
working-directory: ./src
env:
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel build --config oss_android package --config release_build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: bazel build
working-directory: ./src
env:
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel build --config oss_linux package --config release_build
Expand Down Expand Up @@ -67,6 +67,6 @@ jobs:
- name: bazel test
working-directory: ./src
env:
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel test ... --config oss_linux --build_tests_only -c dbg
8 changes: 4 additions & 4 deletions .github/workflows/macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: bazel build
working-directory: ./src
env:
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel build --config oss_macos package --macos_cpus=arm64 --config release_build
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
- name: bazel build
working-directory: ./src
env:
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel build --config oss_macos package --macos_cpus=x86_64 --config release_build
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
- name: bazel build
working-directory: ./src
env:
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel build --config oss_macos package --macos_cpus=x86_64,arm64 --config release_build
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
- name: bazel test
working-directory: ./src
env:
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel test ... --config oss_macos --build_tests_only -c dbg
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
working-directory: .\src
env:
ANDROID_NDK_HOME: ""
USE_BAZEL_VERSION: "7.4.1"
USE_BAZEL_VERSION: "8.0.0"
run: |
bazel --bazelrc=windows.bazelrc build --config oss_windows --config release_build package
Expand Down
5 changes: 2 additions & 3 deletions docker/ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,10 @@ WORKDIR /home/mozc_builder/work
ENV PKG_CONFIG_PATH="/home/mozc_builder/work/mozc/docker/ubuntu22.04/qt6-core-pkgconfig:${PKG_CONFIG_PATH}"

## Set up bazelisk as bazel
RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.22.0/bazelisk-linux-amd64 \
RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/bazelisk-linux-amd64 \
&& mv bazelisk-linux-amd64 /home/mozc_builder/bin/bazel \
&& chmod u+x /home/mozc_builder/bin/bazel
### TODO(https://github.com/google/mozc/issues/1118): Support Bazel 8.0
ENV USE_BAZEL_VERSION 7.4.1
ENV USE_BAZEL_VERSION 8.0.0

## Set up Android SDK and NDK
ENV ANDROID_HOME /home/mozc_builder/Android/Sdk
Expand Down
5 changes: 2 additions & 3 deletions docker/ubuntu24.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ RUN mkdir -p /home/mozc_builder/work
WORKDIR /home/mozc_builder/work

## Set up bazelisk as bazel
RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.22.0/bazelisk-linux-amd64 \
RUN curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/bazelisk-linux-amd64 \
&& mv bazelisk-linux-amd64 /home/mozc_builder/bin/bazel \
&& chmod u+x /home/mozc_builder/bin/bazel
### TODO(https://github.com/google/mozc/issues/1118): Support Bazel 8.0
ENV USE_BAZEL_VERSION 7.4.1
ENV USE_BAZEL_VERSION 8.0.0

## Set up Android SDK and NDK
ENV ANDROID_HOME /home/mozc_builder/Android/Sdk
Expand Down
2 changes: 1 addition & 1 deletion docs/build_mozc_in_osx.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Building on Mac requires the following software.
* Xcode 13 (macOS 13 SDK) or later
* ⚠️Xcode Command Line Tools aren't sufficient.
* [Bazel](https://docs.bazel.build/versions/master/install-os-x.html) for Bazel build
* ⚠️ Bazel 8.x is not yet supported ([#1118](https://github.com/google/mozc/issues/1118))
* check [.bazelversion](../src/.bazelversion) for the supported Bazel version.
* Python 3.9 or later with the following pip module.
* `requests`
* CMake 3.18.4 or later (to build Qt6)
Expand Down
2 changes: 1 addition & 1 deletion docs/build_mozc_in_windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Note that you can specify `--qtdir=` option instead of `--noqt` in GYP phase sin
Additional requirements:

* [Bazel](https://bazel.build/)
* ⚠️ Bazel 8.x is not yet supported ([#1118](https://github.com/google/mozc/issues/1118))
* check [.bazelversion](../src/.bazelversion) for the supported Bazel version.
* [MSYS2](https://github.com/msys2/msys2)

After running `build_tools/update_deps.py` and `build_tools/build_qt.py`, run the following command instead of `build_mozc.py`:
Expand Down
4 changes: 2 additions & 2 deletions src/.bazelversion
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

7.4.1
8.0.0
# The first liine is intentionally empty to allow any Bazel versions.
# We have checked the build and tests with Bazel 7.4.1.
# We have checked the build and tests with Bazel 8.0.0.
# Remove the first line and use Bazelisk to use the confirmed version.

0 comments on commit de99f7b

Please sign in to comment.