From c73d6c8d2e4f8c0068fde63b2077dcd9a64a1e02 Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Mon, 8 Jul 2024 13:41:23 -0700 Subject: [PATCH] Use explicit names of our large runners PiperOrigin-RevId: 650360525 --- .github/workflows/test_cpp.yml | 8 ++++---- .github/workflows/test_upb.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_cpp.yml b/.github/workflows/test_cpp.yml index bbf4300313049..4d3ea0f66f2df 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-large } - - { name: MSAN, flags: --config=docker-msan, runner: ubuntu-20-large } - - { name: TSAN, flags: --config=tsan, runner: ubuntu-20-large } + - { 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: UBSAN, flags: --config=ubsan } - { name: No-RTTI, flags: --cxxopt=-fno-rtti } include: @@ -77,7 +77,7 @@ jobs: matrix: arch: [x86_64, aarch64] name: Linux Release ${{ matrix.arch}} - runs-on: ubuntu-20-large + runs-on: ubuntu-20-4core steps: - name: Checkout pending changes uses: protocolbuffers/protobuf-ci/checkout@v2 diff --git a/.github/workflows/test_upb.yml b/.github/workflows/test_upb.yml index d8c3d1b578679..e25fa60dc4c71 100644 --- a/.github/workflows/test_upb.yml +++ b/.github/workflows/test_upb.yml @@ -19,7 +19,7 @@ jobs: config: - { name: "Fastbuild" } - { name: "Optimized", flags: "-c opt" } - - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-large } + - { name: "ASAN", flags: "--config=asan -c dbg", exclude-targets: "-//benchmarks:benchmark -//python/...", runner: ubuntu-20-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: b/297027295 - Add 32-bit ASAN test