mirror of
https://github.com/TheLartians/ModernCppStarter.git
synced 2025-08-30 21:51:12 +02:00
change github actions to develop branch
set version to v1.0.1
This commit is contained in:
parent
47fa7c6933
commit
1aad14a6fa
9 changed files with 20 additions and 20 deletions
4
.github/workflows/install.yml
vendored
4
.github/workflows/install.yml
vendored
|
@ -3,10 +3,10 @@ name: Install
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
|
||||
env:
|
||||
CTEST_OUTPUT_ON_FAILURE: 1
|
||||
|
|
4
.github/workflows/macos.yml
vendored
4
.github/workflows/macos.yml
vendored
|
@ -3,10 +3,10 @@ name: MacOS
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
|
||||
env:
|
||||
CTEST_OUTPUT_ON_FAILURE: 1
|
||||
|
|
4
.github/workflows/standalone.yml
vendored
4
.github/workflows/standalone.yml
vendored
|
@ -3,10 +3,10 @@ name: Standalone
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
|
||||
env:
|
||||
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
|
||||
|
|
4
.github/workflows/style.yml
vendored
4
.github/workflows/style.yml
vendored
|
@ -3,10 +3,10 @@ name: Style
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
|
||||
env:
|
||||
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm_modules
|
||||
|
|
4
.github/workflows/ubuntu.yml
vendored
4
.github/workflows/ubuntu.yml
vendored
|
@ -3,10 +3,10 @@ name: Ubuntu
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
|
||||
env:
|
||||
CTEST_OUTPUT_ON_FAILURE: 1
|
||||
|
|
4
.github/workflows/windows.yml
vendored
4
.github/workflows/windows.yml
vendored
|
@ -3,10 +3,10 @@ name: Windows
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- develop
|
||||
|
||||
env:
|
||||
CTEST_OUTPUT_ON_FAILURE: 1
|
||||
|
|
|
@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.14...3.19)
|
|||
# Note: update this to your new project's name and version
|
||||
project(
|
||||
Greeter
|
||||
VERSION 1.0
|
||||
VERSION 1.0.1
|
||||
LANGUAGES CXX
|
||||
)
|
||||
|
||||
|
@ -64,12 +64,12 @@ add_library(Greeter SHARED ${headers} ${sources})
|
|||
|
||||
# EITHER:
|
||||
set_target_properties(Greeter PROPERTIES CXX_STANDARD ${CMAKE_CXX_STANDARD})
|
||||
# OR target_compile_features(Greeter PUBLIC cxx_std_17)
|
||||
# OR: target_compile_features(Greeter PUBLIC cxx_std_17)
|
||||
|
||||
# being a cross-platform target, we enforce standards conformance on MSVC
|
||||
target_compile_options(Greeter PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/permissive>")
|
||||
# being a cross-platform target, we enforce standards conformance on MSVC EITHER:
|
||||
# target_compile_options(Greeter PUBLIC "$<$<COMPILE_LANG_AND_ID:CXX,MSVC>:/permissive>") OR:
|
||||
if(MSVC)
|
||||
# target_compile_options(Greeter PUBLIC /permissive)
|
||||
target_compile_options(Greeter PUBLIC /permissive)
|
||||
endif()
|
||||
|
||||
# Link dependencies EITHER:
|
||||
|
|
|
@ -42,7 +42,7 @@ file(GLOB sources CONFIGURE_DEPENDS source/*.cpp)
|
|||
add_executable(GreeterTests ${sources})
|
||||
target_link_libraries(GreeterTests doctest::doctest Greeter::Greeter)
|
||||
|
||||
set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 17)
|
||||
set_target_properties(GreeterTests PROPERTIES CXX_STANDARD 20)
|
||||
|
||||
# enable compiler warnings
|
||||
if(NOT TEST_INSTALLED_VERSION)
|
||||
|
|
|
@ -20,7 +20,7 @@ TEST_CASE("Greeter version") {
|
|||
static_assert(std::string_view(GREETER_VERSION).starts_with("1.0")); // TBD C++20 only
|
||||
CHECK(std::string(GREETER_VERSION).starts_with("1.0")); // SameMajorVersion
|
||||
#else
|
||||
static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0"));
|
||||
CHECK(std::string(GREETER_VERSION) == std::string("1.0"));
|
||||
static_assert(std::string_view(GREETER_VERSION) == std::string_view("1.0.1"));
|
||||
CHECK(std::string(GREETER_VERSION) == std::string("1.0.1"));
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue