From 32276bb869cc78724c4800649336b83fedd7ae25 Mon Sep 17 00:00:00 2001 From: Robin Linden Date: Sat, 2 Dec 2023 02:44:55 +0100 Subject: [PATCH 1/2] ci: Combine the asan and ubsan jobs Running these two sanitizers together is fine, so let's do that to save ourselves a job. This means we're also updating the asan job to use LLVM 15 instead of 14, but that's fine since we still use LLVM 14 for our tsan tests. --- .github/workflows/ci.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ef458bd8..dd1b958c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -32,18 +32,12 @@ jobs: version: 14 bazel: --config tsan - - name: clang-asan - os: ubuntu-22.04 - compiler: clang - version: 14 - bazel: --config asan - # https://github.com/llvm/llvm-project/issues/49689 - - name: clang-ubsan + - name: clang-15-asan-ubsan os: ubuntu-22.04 compiler: clang version: 15 - bazel: --config ubsan + bazel: --config asan --config ubsan - name: clang-17 os: ubuntu-22.04 From eddd3e1d462ccf511d440951931297cb2b625b45 Mon Sep 17 00:00:00 2001 From: Robin Linden Date: Sat, 2 Dec 2023 02:47:47 +0100 Subject: [PATCH 2/2] ci: Don't run jobs again when pushing to master We used to need this to get a correct code coverage report, but since we no longer merge using the buttons on the GitHub website, all our merges are fast-forward, and this should no longer be needed. --- .github/workflows/ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index dd1b958c..45ea7f3e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,8 +1,6 @@ on: pull_request: workflow_dispatch: - push: - branches: [master] name: ci # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions