From 4cc76538831aa5a43a5e47d1371b909aac5907e2 Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Wed, 30 Mar 2022 07:28:59 +0200 Subject: [PATCH] be prepared for git flow too --- .github/workflows/install.yml | 2 ++ .github/workflows/macos.yml | 2 ++ .github/workflows/standalone.yml | 2 ++ .github/workflows/style.yml | 2 ++ .github/workflows/ubuntu.yml | 2 ++ .github/workflows/windows.yml | 2 ++ standalone/CMakeLists.txt | 2 +- 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml index 8e616f9..fae7db5 100644 --- a/.github/workflows/install.yml +++ b/.github/workflows/install.yml @@ -3,10 +3,12 @@ name: Install on: push: branches: + - develop - master - main pull_request: branches: + - develop - master - main diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 7f82fed..b0870d9 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -3,10 +3,12 @@ name: MacOS on: push: branches: + - develop - master - main pull_request: branches: + - develop - master - main diff --git a/.github/workflows/standalone.yml b/.github/workflows/standalone.yml index 079ca7e..b2c92f6 100644 --- a/.github/workflows/standalone.yml +++ b/.github/workflows/standalone.yml @@ -3,10 +3,12 @@ name: Standalone on: push: branches: + - develop - master - main pull_request: branches: + - develop - master - main diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml index 97995f9..476c394 100644 --- a/.github/workflows/style.yml +++ b/.github/workflows/style.yml @@ -3,10 +3,12 @@ name: Style on: push: branches: + - develop - master - main pull_request: branches: + - develop - master - main diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 16e82af..03ade75 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -3,10 +3,12 @@ name: Ubuntu on: push: branches: + - develop - master - main pull_request: branches: + - develop - master - main diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2d8ec46..bab6379 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,10 +3,12 @@ name: Windows on: push: branches: + - develop - master - main pull_request: branches: + - develop - master - main diff --git a/standalone/CMakeLists.txt b/standalone/CMakeLists.txt index 1339192..d1f9380 100644 --- a/standalone/CMakeLists.txt +++ b/standalone/CMakeLists.txt @@ -27,7 +27,7 @@ add_executable(${PROJECT_NAME} ${sources}) # enable pedantic compiler warnings include(../cmake/WarningsAsErrors.cmake) -# TODO(CK): why is this needed on CI? +# TODO(CK): why is this name used on CI? set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME Greeter) target_link_libraries(${PROJECT_NAME} Greeter::Greeter cxxopts)