aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kruskal <mkruskal@google.com>2024-03-15 20:19:23 -0700
committerMike Kruskal <mkruskal@google.com>2024-03-19 20:28:23 -0700
commitff4f9a3a808c706d249426a25698f5d2a65210d1 (patch)
tree573ed0a9fd8e03596999764cfb7771c0fc977a17
parent9f24c09d22be5747f1d831e32ee22d88f6450888 (diff)
downloadprotobuf-ff4f9a3a808c706d249426a25698f5d2a65210d1.tar.gz
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
-rw-r--r--.github/workflows/test_cpp.yml6
-rw-r--r--.github/workflows/test_upb.yml4
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml
index 91a344312..7ca1bf574 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-22-large }
- - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-22-large }
- - { 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 cb8545644..3c257356f 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