From 186637c3c28f65efba9263932e014b500565ae65 Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Mon, 18 Mar 2024 11:20:00 -0400
Subject: [PATCH 1/2] Revert "make fuzz and sanitizer tests not break CI."

This reverts commit bd37b605b21ce1c5d8a53dd44b249fb34f412d64.
---
 .github/workflows/build.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7acb73140..a062c4501 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -173,10 +173,6 @@ jobs:
           --breakage-allowlist-path known_api_breaks.txt
 
   sanitizer_testing:
-    # Something likely changed in the base ubuntu image causing failures,
-    # don't fail the build based on these changes.
-    # https://github.com/apple/swift-protobuf/issues/1571
-    continue-on-error: true
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -206,10 +202,6 @@ jobs:
         swift test -c ${{ matrix.swiftpm_config }} --sanitize=${{ matrix.sanitizer }} ${EXTRAS:-}
 
   fuzzing_regressions:
-    # Something likely changed in the base ubuntu image causing failures,
-    # don't fail the build based on these changes.
-    # https://github.com/apple/swift-protobuf/issues/1573
-    continue-on-error: true
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

From a204b258b7dcf9d12b7faaebe0906e00e70df2ff Mon Sep 17 00:00:00 2001
From: Thomas Van Lenten <thomasvl@google.com>
Date: Mon, 18 Mar 2024 11:21:30 -0400
Subject: [PATCH 2/2] Use older base image for sanitizer and fuzz testing.

The latest ubuntu seems to break sanitizers/fuzz testing, so use an older
version for the time being to get the tests back online.

Make sure the Swift image matches also just for safety sake.
---
 .github/workflows/build.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a062c4501..2cb877dbf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -173,14 +173,19 @@ jobs:
           --breakage-allowlist-path known_api_breaks.txt
 
   sanitizer_testing:
-    runs-on: ubuntu-latest
+    # Using older ubuntu image due to issue with newer linux kernel images. When
+    # changing, see the "container" value below.
+    # https://github.com/apple/swift-protobuf/issues/1571
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         sanitizer: ["address", "thread"]
         swiftpm_config: ["debug", "release"]
     container:
-      image: swift:latest
+      # Test on the latest Swift release, but forcing the focal image to match the
+      # ubuntu issue mentioned aboce.
+      image: swift:focal
     steps:
     - uses: actions/checkout@v4
     - name: Test
@@ -202,13 +207,18 @@ jobs:
         swift test -c ${{ matrix.swiftpm_config }} --sanitize=${{ matrix.sanitizer }} ${EXTRAS:-}
 
   fuzzing_regressions:
-    runs-on: ubuntu-latest
+    # Using older ubuntu image due to issue with newer linux kernel images. When
+    # changing, see the "container" value below.
+    # https://github.com/apple/swift-protobuf/issues/1571
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         swiftpm_config: ["debug", "release"]
     container:
-      image: swift:latest
+      # Test on the latest Swift release, but forcing the focal image to match the
+      # ubuntu issue mentioned aboce.
+      image: swift:focal
     steps:
     - uses: actions/checkout@v4
     - name: Build