From 6afbe52863b10e2bb8b11d1c5db04b5acf76129c Mon Sep 17 00:00:00 2001
From: Ted Xie <tedx@google.com>
Date: Fri, 24 Jul 2026 16:04:35 -0400
Subject: [PATCH 1/2] [release-9.3.0] Stop building for ubuntu 20.04

Ubuntu 20.04 is EOL.
---
 .bazelci/build_bazel_binaries.yml |  9 +------
 .bazelci/postsubmit.yml           | 34 ++-------------------------
 .bazelci/presubmit.yml            | 39 ++++---------------------------
 3 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/.bazelci/build_bazel_binaries.yml b/.bazelci/build_bazel_binaries.yml
index 8bbd60ba4bc531..3b3a883154c444 100644
--- a/.bazelci/build_bazel_binaries.yml
+++ b/.bazelci/build_bazel_binaries.yml
@@ -14,14 +14,7 @@ platforms:
     build_flags:
       - "-c"
       - "opt"
-  ubuntu2004:
-    build_targets:
-      - "//src:bazel"
-      - "//src:bazel_nojdk"
-    build_flags:
-      - "-c"
-      - "opt"
-  ubuntu2004_arm64:
+  ubuntu2404_arm64:
     build_targets:
       - "//src:bazel"
       - "//src:bazel_nojdk"
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index f62645283bb318..485e03cde3a62b 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -103,8 +103,8 @@ tasks:
     include_json_profile:
       - build
       - test
-  ubuntu2004_clang:
-    platform: ubuntu2004
+  ubuntu2404_clang:
+    platform: ubuntu2404
     environment:
       CC: clang
       CC_CONFIGURE_DEBUG: 1
@@ -126,36 +126,6 @@ tasks:
     include_json_profile:
       - build
       - test
-  ubuntu2004:
-    shell_commands:
-      - rm -rf $HOME/bazeltest
-      - mkdir $HOME/bazeltest
-    build_flags:
-      - "--config=ci-linux"
-    build_targets:
-      - "//src:bazel"
-      - "//src:bazel_jdk_minimal"
-      - "//src:test_repos"
-      - "//src/main/java/..."
-    test_flags:
-      - "--config=ci-linux"
-    test_targets:
-      - "//scripts/..."
-      - "//src/java_tools/..."
-      - "//src/main/starlark/tests/builtins_bzl/..."
-      - "//src/test/..."
-      - "//src/tools/execlog/..."
-      - "//src/tools/one_version/..."
-      - "//src/tools/singlejar/..."
-      - "//src/tools/workspacelog/..."
-      - "//third_party/ijar/..."
-      - "//tools/aquery_differ/..."
-      - "//tools/python/..."
-      - "//tools/bash/..."
-      - "//tools/test/..."
-    include_json_profile:
-      - build
-      - test
   macos:
     shards: 5
     shell_commands:
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 06b676cc41ce22..5ccec24083a586 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -105,8 +105,8 @@ tasks:
     include_json_profile:
       - build
       - test
-  ubuntu2004_clang:
-    platform: ubuntu2004
+  ubuntu2404_clang:
+    platform: ubuntu2404
     environment:
       CC: clang
       CC_CONFIGURE_DEBUG: 1
@@ -128,37 +128,6 @@ tasks:
     include_json_profile:
       - build
       - test
-  ubuntu2004:
-    shards: 4
-    shell_commands:
-      - rm -rf $HOME/bazeltest
-      - mkdir $HOME/bazeltest
-    build_flags:
-      - "--config=ci-linux"
-    build_targets:
-      - "//src:bazel"
-      - "//src:bazel_jdk_minimal"
-      - "//src:test_repos"
-      - "//src/main/java/..."
-    test_flags:
-      - "--config=ci-linux"
-    test_targets:
-      - "//scripts/..."
-      - "//src/java_tools/..."
-      - "//src/main/starlark/tests/builtins_bzl/..."
-      - "//src/test/..."
-      - "//src/tools/execlog/..."
-      - "//src/tools/one_version/..."
-      - "//src/tools/singlejar/..."
-      - "//src/tools/workspacelog/..."
-      - "//third_party/ijar/..."
-      - "//tools/aquery_differ/..."
-      - "//tools/python/..."
-      - "//tools/bash/..."
-      - "//tools/test/..."
-    include_json_profile:
-      - build
-      - test
   macos:
     shards: 10
     shell_commands:
@@ -367,8 +336,8 @@ tasks:
     include_json_profile:
       - build
       - test
-  docs_ubuntu2004:
-    platform: ubuntu2004
+  docs_ubuntu2404:
+    platform: ubuntu2404
     name: "Docs"
     build_flags:
       - "--config=docs"

From bc9f153f9120b3555e4e1861829b7a3b1568ee5c Mon Sep 17 00:00:00 2001
From: Ted Xie <tedx@google.com>
Date: Fri, 24 Jul 2026 16:09:55 -0400
Subject: [PATCH 2/2] also build for ubuntu 22.04

---
 .bazelci/build_bazel_binaries.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.bazelci/build_bazel_binaries.yml b/.bazelci/build_bazel_binaries.yml
index 3b3a883154c444..d75af9fb641369 100644
--- a/.bazelci/build_bazel_binaries.yml
+++ b/.bazelci/build_bazel_binaries.yml
@@ -31,6 +31,13 @@ platforms:
     build_flags:
       - "-c"
       - "opt"
+  ubuntu2204:
+    build_targets:
+      - "//src:bazel"
+      - "//src:bazel_nojdk"
+    build_flags:
+      - "-c"
+      - "opt"
   macos:
     build_targets:
       - "//src:bazel"