From 0176f8a72a08aa1139f90320df2ef558787a9b95 Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Fri, 15 Mar 2024 20:19:23 -0700
Subject: [PATCH] Downgrade our sanitized builds to ubuntu-20.

The latest github runner image of ubuntu-22 includes a kernel update that breaks the sanitizers we use in our docker images.  Long-term, we'll likely need to upgrade the images to new sanitizers and clang.

PiperOrigin-RevId: 616319042
---
 .github/workflows/test_cpp.yml | 7 +++----
 .github/workflows/test_upb.yml | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index ca7e208b35..117ccc8e10 100644
--- a/.github/workflows/test_cpp.yml
+++ b/.github/workflows/test_cpp.yml
@@ -19,10 +19,9 @@ jobs:
         config:
           - { name: Optimized, flags: --config=opt }
           - { name: Debug, flags: --config=dbg }
-          - { name: ASAN, flags: --config=asan, runner: ubuntu-22-large }
-          - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-22-large }
-          # TODO Disable until TSAN bug is resolved
-          # - { name: TSAN, flags: --config=tsan }
+          - { name: ASAN, flags: --config=asan, runner: ubuntu-20-large }
+          - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-20-large }
+          - { name: TSAN, flags: --config=tsan, runner: ubuntu-20-large }
           - { name: UBSAN, flags: --config=ubsan }
           - { name: No-RTTI, flags: --cxxopt=-fno-rtti }
         include:
diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml
index cb85456448..3c257356fc 100644
--- a/.github/workflows/test_upb.yml
+++ b/.github/workflows/test_upb.yml
@@ -20,14 +20,14 @@ jobs:
           - { name: "Bazel 7", bazel_version: "7.0.0" }
           - { name: "Fastbuild" }
           - { name: "Optimized", flags: "-c opt" }
-          - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/..." }
+          - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-large }
           - { name: "UBSAN", flags: "--config=ubsan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/... -//lua/..." }
           - { name: "32-bit", flags: "--copt=-m32 --linkopt=-m32", exclude-targets: "-//benchmarks:benchmark -//python/..." }
           # TODO: Add 32-bit ASAN test
           # TODO: Restore the FastTable tests
 
     name: ${{ matrix.config.name }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.config.runner || 'ubuntu-latest' }}
 
     steps:
       - name: Checkout pending changes