feat(abseil-cpp): Migrate to Ubuntu 24.04

hunsche · hunsche · commit c15420082601 · 2025-10-31T14:53:25.000Z
diff --git a/infra/ci/check_base_os.py b/infra/ci/check_base_os.py
@@ -28,7 +28,7 @@
 SUPPORTED_VERSIONS = [
     'legacy',
     # 'ubuntu-20-04',
-    # 'ubuntu-24-04',
+    'ubuntu-24-04',
 ]
 
 # A map from the base_os_version in project.yaml to the expected Dockerfile
diff --git a/infra/presubmit.py b/infra/presubmit.py
@@ -86,6 +86,7 @@ class ProjectYamlChecker:
   VALID_SECTION_NAMES = [
       'architectures',
       'auto_ccs',
+      'base_os_version',
       'blackbox',
       'builds_per_day',
       'coverage_extra_args',
diff --git a/projects/abseil-cpp/Dockerfile b/projects/abseil-cpp/Dockerfile
@@ -14,6 +14,6 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/abseil/abseil-cpp.git
 COPY BUILD WORKSPACE build.sh *_fuzzer.cc $SRC/
diff --git a/projects/abseil-cpp/project.yaml b/projects/abseil-cpp/project.yaml
@@ -1,4 +1,5 @@
 homepage: "abseil.io"
+base_os_version: ubuntu-24-04
 language: c++
 primary_contact: "dmauro@google.com"
 main_repo: 'https://github.com/abseil/abseil-cpp.git'

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`SUPPORTED_VERSIONS = [`
`29`	`29`	`'legacy',`
`30`	`30`	`# 'ubuntu-20-04',`
`31`		`- # 'ubuntu-24-04',`
	`31`	`+ 'ubuntu-24-04',`
`32`	`32`	`]`
`33`	`33`
`34`	`34`	`# A map from the base_os_version in project.yaml to the expected Dockerfile`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@`
`14`	`14`	`#`
`15`	`15`	`################################################################################`
`16`	`16`
`17`		`-FROM gcr.io/oss-fuzz-base/base-builder`
	`17`	`+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04`
`18`	`18`	`RUN git clone --depth 1 https://github.com/abseil/abseil-cpp.git`
`19`	`19`	`COPY BUILD WORKSPACE build.sh *_fuzzer.cc $SRC/`