Skip to content

Commit c0ba2a7

Browse files
jnthntatumcopybara-github
authored andcommitted
Bump absl version and update CI
- Update to latest absl release - Bump compiler versions in dockerfiles - update codelab reference dockerfile to better match the gcb image PiperOrigin-RevId: 940625528
1 parent 58e4b50 commit c0ba2a7

4 files changed

Lines changed: 17 additions & 81 deletions

File tree

Dockerfile

Lines changed: 0 additions & 69 deletions
This file was deleted.

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ bazel_dep(
3939
)
4040
bazel_dep(
4141
name = "abseil-cpp",
42-
version = "20260107.0",
42+
version = "20260526.0",
4343
repo_name = "com_google_absl",
4444
)
4545
bazel_dep(

cloudbuild.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
steps:
2-
- name: 'gcr.io/cel-analysis/cel-cpp/ubuntu_floor@sha256:211a0c505b361d987b3d8b08a5144a84e62cb95edc3f897fe46d5cd3f556f79d'
2+
- name: 'gcr.io/cel-analysis/cel-cpp/ubuntu_floor@sha256:fbcc9edb13aa855f435993bf12ec4fd59f8b72e7d715bbc4c72e7a2298f0bcc2'
33
args:
44
- '--output_base=/bazel' # This is mandatory to avoid steps accidently sharing data.
55
- 'test'
@@ -14,18 +14,23 @@ steps:
1414
- '--local_ram_resources=HOST_RAM*.4'
1515
- '--remote_cache=https://storage.googleapis.com/cel-cpp-remote-cache'
1616
- '--google_default_credentials'
17-
id: gcc-9
17+
id: gcc-10
1818
waitFor: ['-']
19-
- name: 'gcr.io/cel-analysis/cel-cpp/ubuntu_floor@sha256:211a0c505b361d987b3d8b08a5144a84e62cb95edc3f897fe46d5cd3f556f79d'
19+
- name: 'gcr.io/cel-analysis/cel-cpp/ubuntu_floor@sha256:fbcc9edb13aa855f435993bf12ec4fd59f8b72e7d715bbc4c72e7a2298f0bcc2'
2020
env:
21-
- 'CC=clang-11'
22-
- 'CXX=clang++-11'
21+
- 'CC=clang-14'
22+
- 'CXX=clang++-14'
2323
args:
2424
- '--output_base=/bazel' # This is mandatory to avoid steps accidently sharing data.
2525
- 'test'
2626
- '...'
2727
- '--enable_bzlmod'
2828
- '--copt=-Wno-deprecated-declarations'
29+
- '--copt=-Wno-unknown-warning-option'
30+
# some older versions of clang (<16) complain about some template metaprogramming in
31+
# absl in this release but otherwise it builds fine. Should be fixed in the next release.
32+
# https://github.com/abseil/abseil-cpp/issues/2073
33+
- '--copt=-Wno-invalid-partial-specialization'
2934
- '--compilation_mode=fastbuild'
3035
- '--test_output=errors'
3136
- '--show_timestamps'
@@ -34,7 +39,7 @@ steps:
3439
- '--local_ram_resources=HOST_RAM*.4'
3540
- '--remote_cache=https://storage.googleapis.com/cel-cpp-remote-cache'
3641
- '--google_default_credentials'
37-
id: clang-11
42+
id: clang-14
3843
waitFor: ['-']
3944
timeout: 1h
4045
options:

codelab/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
ARG DEBIAN_IMAGE="marketplace.gcr.io/google/debian11:latest"
2-
FROM ${DEBIAN_IMAGE}
1+
ARG UBUNTU_IMAGE="ubuntu:22.04"
2+
FROM ${UBUNTU_IMAGE}
33

44
ARG BAZELISK_RELEASE="https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/bazelisk-amd64.deb"
55

6-
RUN apt update && apt upgrade -y && apt install -y gcc-9 g++-9 clang-13 git curl bash openjdk-11-jdk-headless
6+
RUN apt update && apt upgrade -y && apt install -y gcc-10 g++-10 clang-14 git curl bash openjdk-11-jdk-headless
77

88
RUN curl -L ${BAZELISK_RELEASE} > ./bazelisk.deb
99
RUN apt install ./bazelisk.deb
1010

1111
RUN git clone https://github.com/google/cel-cpp.git
1212

13-
ENV CXX=clang++-13
14-
ENV CC=clang-13
13+
ENV CXX=g++-10
14+
ENV CC=gcc-10
1515

1616
WORKDIR /cel-cpp
1717
# not generally recommended to cache the bazel build in the image,

0 commit comments

Comments
 (0)