From f46e776b1f020bd6eea9916a0e7ad8502f69824c Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Tue, 9 Jul 2024 12:36:24 -0700 Subject: [PATCH] Upgrade sanitizer tests back to ubuntu 22 Our test images now have sanitizers that support githubs kernel update. PiperOrigin-RevId: 650723051 --- .github/workflows/test_cpp.yml | 6 +++--- .github/workflows/test_upb.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index 866d0d9867..6c095a2171 100644 --- a/.github/workflows/test_cpp.yml +++ b/.github/workflows/test_cpp.yml @@ -19,9 +19,9 @@ jobs: config: - { name: Optimized, flags: --config=opt } - { name: Debug, flags: --config=dbg } - - { name: ASAN, flags: --config=asan, runner: ubuntu-20-4core } - - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-20-4core } - - { name: TSAN, flags: --config=tsan, runner: ubuntu-20-4core } + - { name: ASAN, flags: --config=asan, runner: ubuntu-22-4core } + - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-22-4core } + - { name: TSAN, flags: --config=tsan, runner: ubuntu-22-4core } - { 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 92e0e4ee85..945b7c01b4 100644 --- a/.github/workflows/test_upb.yml +++ b/.github/workflows/test_upb.yml @@ -20,7 +20,7 @@ jobs: - { name: "Bazel 7", bazel_version: "7.1.1" } - { name: "Fastbuild" } - { name: "Optimized", flags: "-c opt" } - - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-4core } + - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-22-4core } - { 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