Skip to content

Commit fa4f9ae

Browse files
authored
Merge pull request #150 from google/cpp-sync
Update CI
2 parents 47da557 + ff3cd50 commit fa4f9ae

5 files changed

Lines changed: 38 additions & 9 deletions

File tree

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
5.0.0

Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
FROM ubuntu:bionic
1+
FROM gcr.io/gcp-runtimes/ubuntu_20_0_4
22

33
ENV DEBIAN_FRONTEND=noninteractive
44

55
RUN rm -rf /var/lib/apt/lists/* \
66
&& apt-get update --fix-missing -qq \
7-
&& apt-get install -qqy --no-install-recommends ca-certificates tzdata wget git clang-10 patch \
7+
&& apt-get install -qqy --no-install-recommends build-essential ca-certificates tzdata wget git default-jdk clang-12 lld-12 patch \
88
&& apt-get clean && rm -rf /var/lib/apt/lists/*
99

1010
RUN wget https://github.com/bazelbuild/bazelisk/releases/download/v1.5.0/bazelisk-linux-amd64 && chmod +x bazelisk-linux-amd64 && mv bazelisk-linux-amd64 /bin/bazel
1111

12-
ENV CC=clang-10
13-
ENV CXX=clang++-10
12+
ENV CC=clang-12
13+
ENV CXX=clang++-12
14+
15+
RUN mkdir -p /workspace
1416

1517
ENTRYPOINT ["/bin/bazel"]

bazel/deps.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def parser_deps():
7777
)
7878

7979
ANTLR4_RUNTIME_GIT_SHA = "70b2edcf98eb612a92d3dbaedb2ce0b69533b0cb" # Dec 7, 2021
80-
ANTLR4_RUNTIME_SHA = ""
80+
ANTLR4_RUNTIME_SHA = "fae73909f95e1320701e29ac03bab9233293fb5b90d3ce857279f1b46b614c83"
8181
http_archive(
8282
name = "antlr4_runtimes",
8383
build_file_content = """

cloudbuild.yaml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
11
steps:
2-
- name: 'gcr.io/cel-analysis/bazel:bionic-3.0.0'
2+
- name: 'gcr.io/cel-analysis/bazel:ubuntu_20_0_4'
33
entrypoint: bazel
4-
args: ['test', '--test_output=errors', '...']
4+
args:
5+
- '--output_base=/bazel'
6+
- 'test'
7+
- '--test_output=errors'
8+
- '...'
59
id: bazel-test
6-
waitFor: ['-']
10+
- name: 'gcr.io/cel-analysis/bazel:ubuntu_20_0_4'
11+
entrypoint: bazel
12+
args:
13+
- '--output_base=/bazel'
14+
- 'test'
15+
- '--config=asan'
16+
- '--test_output=errors'
17+
- '...'
18+
id: bazel-asan
19+
- name: 'gcr.io/cel-analysis/bazel:ubuntu_20_0_4'
20+
entrypoint: bazel
21+
env:
22+
- 'CC=gcc'
23+
- 'CXX=g++'
24+
args:
25+
- '--output_base=/bazel'
26+
- 'test'
27+
- '--test_output=errors'
28+
- '...'
29+
id: bazel-gcc
730
timeout: 1h
831
options:
932
machineType: 'N1_HIGHCPU_8'
33+
volumes:
34+
- name: bazel
35+
path: /bazel

eval/public/cel_type_registry.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ void CelTypeRegistry::Register(const google::protobuf::EnumDescriptor* enum_desc
5757

5858
const google::protobuf::Descriptor* CelTypeRegistry::FindDescriptor(
5959
absl::string_view fully_qualified_type_name) const {
60+
// Public protobuf interface only accepts const string&.
6061
return google::protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(
6162
std::string(fully_qualified_type_name));
6263
}

0 commit comments

Comments
 (0)