From cc5df211277e233123568035060da3597cb709d1 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 21 Mar 2025 21:59:25 +0100 Subject: [PATCH 1/2] build(cmake): fix generator expression Fix: #733 --- core/CMakeLists.txt | 2 +- pull/CMakeLists.txt | 2 +- push/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 98d5bfc6..180e3f1e 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -26,7 +26,7 @@ target_compile_features(core target_link_libraries(core PRIVATE Threads::Threads - $<$,$>>:rt> + $<$,$>>:rt> ) if(HAVE_CXX_LIBATOMIC) diff --git a/pull/CMakeLists.txt b/pull/CMakeLists.txt index 101772f9..162987de 100644 --- a/pull/CMakeLists.txt +++ b/pull/CMakeLists.txt @@ -47,7 +47,7 @@ target_link_libraries(pull ${PROJECT_NAME}::util Threads::Threads $,${PROJECT_NAME}::civetweb,civetweb::civetweb-cpp> - $<$,$>>:rt> + $<$,$>>:rt> $<$:ZLIB::ZLIB> ) diff --git a/push/CMakeLists.txt b/push/CMakeLists.txt index f6110b1d..19f22e1f 100644 --- a/push/CMakeLists.txt +++ b/push/CMakeLists.txt @@ -24,7 +24,7 @@ target_link_libraries(push PRIVATE ${PROJECT_NAME}::util Threads::Threads - $<$,$>>:rt> + $<$,$>>:rt> ) target_include_directories(push From 3c4cb6b8a0d08eaf933958c57084a49af11695ea Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Fri, 21 Mar 2025 22:08:59 +0100 Subject: [PATCH 2/2] ci: also trigger on master branch --- .github/workflows/bazel-ci.yml | 6 +++++- .github/workflows/cmake-ci.yml | 6 +++++- .github/workflows/coverage.yml | 6 +++++- .github/workflows/linting.yml | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bazel-ci.yml b/.github/workflows/bazel-ci.yml index ab179ca7..afbc158f 100644 --- a/.github/workflows/bazel-ci.yml +++ b/.github/workflows/bazel-ci.yml @@ -1,5 +1,9 @@ name: Bazel CI -on: [pull_request] +on: + pull_request: + push: + branches: + - master jobs: build: diff --git a/.github/workflows/cmake-ci.yml b/.github/workflows/cmake-ci.yml index d8976fd5..91f74778 100644 --- a/.github/workflows/cmake-ci.yml +++ b/.github/workflows/cmake-ci.yml @@ -1,5 +1,9 @@ name: CMake CI -on: [pull_request] +on: + pull_request: + push: + branches: + - master jobs: build: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index b273c509..9da81714 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,5 +1,9 @@ name: Coverage -on: [pull_request] +on: + pull_request: + push: + branches: + - master jobs: build: diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index ce88357f..eb6e5f33 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -1,5 +1,9 @@ name: Linting -on: [pull_request] +on: + pull_request: + push: + branches: + - master jobs: iwyu: