From f11a96744496369c128b24fe8f5c153d8c5aa0e8 Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Sun, 18 Aug 2024 12:59:01 -0500 Subject: [PATCH] Another ci script fix for mac --- ci/unittest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/unittest.py b/ci/unittest.py index 159abc1..cd81e56 100644 --- a/ci/unittest.py +++ b/ci/unittest.py @@ -35,7 +35,7 @@ def build(runner: MatrixRunner): f"-DCPPTRACE_USE_EXTERNAL_LIBDWARF=On", f"-DCPPTRACE_USE_EXTERNAL_ZSTD=On", f"-DCPPTRACE_USE_EXTERNAL_GTEST=On", - *(["-DCMAKE_CXX_FLAGS=-stdlib=libc++"] if 'stdlib' in matrix and matrix['stdlib'] == "libc++" else []) + *(["-DCMAKE_CXX_FLAGS=-stdlib=libc++"] if "stdlib" in matrix and matrix["stdlib"] == "libc++" else []) ] return runner.run_command(*args) and runner.run_command("ninja") elif platform.system() == "Darwin": @@ -88,7 +88,7 @@ def build_and_test(runner: MatrixRunner): if ( last is None or last["compiler"] != current["compiler"] - or last["stdlib"] != current["stdlib"] + or ("stdlib" in current and last["stdlib"] != current["stdlib"]) or (platform.system() == "Darwin" and last["sanitizers"] != current["sanitizers"]) ) and os.path.exists("build"): shutil.rmtree("build", ignore_errors=True)