Skip to content

Commit 8efe93d

Browse files
hanyangtaycopybara-github
authored andcommitted
Fix Bazel build by using a newer Ubuntu image which will install newer clang versions by default.
PiperOrigin-RevId: 750215059
1 parent c161515 commit 8efe93d

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

.kokoro/gcp_ubuntu/kokoro_build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ set -eu
2222
# in the job configuration.
2323
cd "${KOKORO_ARTIFACTS_DIR}/github/silifuzz/.kokoro/gcp_ubuntu"
2424

25-
# Pin Debian Docker image to bookworm for better hermeticity.
25+
# Pin Ubuntu Docker image to noble for updated clang and better hermeticity.
2626
# See https://github.com/google/silifuzz/issues/9.
27-
DOCKER_IMAGE=debian:bookworm
27+
DOCKER_IMAGE=ubuntu:noble
2828

2929
docker run \
3030
--security-opt seccomp=unconfined \

install_build_dependencies.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
# Tested on Debian GNU/Linux 11 (bullseye)
16+
# Tested on Ubuntu 24.04 (Noble Numbat).
1717
#
1818
# * git: to get the SiliFuzz sources.
1919
# * bazel, clang, lld, python: to build SiliFuzz
2020
# * libssl-dev: silifuzz uses SHA1.
21-
# Clang 11 or newer will work.
21+
# Clang 18 or newer will work.
2222
# To get all of the functionality you may need to install fresh clang from
2323
# source: https://llvm.org/.
2424

@@ -36,4 +36,8 @@ echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" \
3636
apt update
3737

3838
# Install dependencies.
39-
apt install --no-install-recommends -y git bazel bazel-7.4.1 libssl-dev libzstd-dev clang libclang-rt-dev lld python3 libpython3-stdlib
39+
# `DEBIAN_FRONTEND=noninteractive` avoids interactive prompts that interrupt the
40+
# script while installing a transitive dependency: `tzdata`.
41+
# Note that this is a debconf-specific env var that is required by both Debian
42+
# and Ubuntu.
43+
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y git bazel bazel-7.4.1 libssl-dev libzstd-dev clang libclang-rt-dev lld python3 libpython3-stdlib

0 commit comments

Comments
 (0)