mirror of
https://github.com/netbirdio/gvisor.git
synced 2026-05-22 17:12:49 -07:00
Update ABSL dependencies to work on Ubuntu Jammy
The ABSL benchmark is broken after updating our image to ubuntu jammy. This is due to the C++ versioning being incompatible for some types used in ABSL with the new ubuntu image's copiler. The image uses a very old image of bazel and a very old commit of bazel. In addition, ABSL has upgraded to C++14. Thus, we could: - Go back to the previous Ubuntu version. - Hand jam an older gcc version into the newer ubuntu image. - Just update everything to the latest state of the world. This CL chooses the last option. This means that we can't compare our new data from the data from before the test broke. But the test has been broken for about a month anyway and it will still give us a trendline going forward. PiperOrigin-RevId: 684626218
This commit is contained in:
committed by
gVisor bot
parent
caa2548d20
commit
dc4e13c863
@@ -13,10 +13,10 @@ RUN set -x \
|
||||
python3 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN wget https://github.com/bazelbuild/bazel/releases/download/0.27.0/bazel-0.27.0-installer-linux-x86_64.sh
|
||||
RUN chmod +x bazel-0.27.0-installer-linux-x86_64.sh
|
||||
RUN ./bazel-0.27.0-installer-linux-x86_64.sh
|
||||
RUN wget https://github.com/bazelbuild/bazel/releases/download/7.3.2/bazel-7.3.2-installer-linux-x86_64.sh
|
||||
RUN chmod +x bazel-7.3.2-installer-linux-x86_64.sh
|
||||
RUN ./bazel-7.3.2-installer-linux-x86_64.sh
|
||||
|
||||
RUN mkdir abseil-cpp && cd abseil-cpp \
|
||||
&& git init && git remote add origin https://github.com/abseil/abseil-cpp.git \
|
||||
&& git fetch --depth 1 origin 43ef2148c0936ebf7cb4be6b19927a9d9d145b8f && git checkout FETCH_HEAD
|
||||
&& git fetch --depth 1 origin 79e414672f447ac1b27f8cb27ad61df315a3792b && git checkout FETCH_HEAD
|
||||
|
||||
@@ -47,7 +47,7 @@ func runBuildBenchmark(b *testing.B, image, workDir, target string) {
|
||||
fsbench.RunWithDifferentFilesystems(ctx, b, machine, fsbench.FSBenchmark{
|
||||
Image: image,
|
||||
WorkDir: workDir,
|
||||
RunCmd: []string{"bazel", "build", "-c", "opt", target},
|
||||
RunCmd: []string{"bazel", "build", "-c", "opt", "--host_cxxopt=-std=c++14", "--cxxopt=-std=c++14", target},
|
||||
WantOutput: "Build completed successfully",
|
||||
CleanCmd: []string{"blaze", "clean"},
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user