Skip to content

Commit b3ed298

Browse files
committed
Merge branch 'dev'
2 parents d0f76a7 + 97a2ee0 commit b3ed298

File tree

5 files changed

+89
-8
lines changed

5 files changed

+89
-8
lines changed
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
2+
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
3+
name: CMake on multiple platforms
4+
5+
on:
6+
push:
7+
branches: [ "dev", "main" ]
8+
pull_request:
9+
branches: [ "dev", "main" ]
10+
11+
jobs:
12+
build:
13+
runs-on: ${{ matrix.os }}
14+
15+
strategy:
16+
# Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
17+
fail-fast: false
18+
19+
# Set up a matrix to run the following 3 configurations:
20+
# 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
21+
# 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
22+
# 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
23+
#
24+
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
25+
matrix:
26+
os: [ubuntu-latest]
27+
build_type: [Release]
28+
c_compiler: [gcc, clang]
29+
include:
30+
- os: ubuntu-latest
31+
c_compiler: gcc
32+
cpp_compiler: g++
33+
- os: ubuntu-latest
34+
c_compiler: clang
35+
cpp_compiler: clang++
36+
exclude:
37+
- os: ubuntu-latest
38+
c_compiler: cl
39+
40+
steps:
41+
- uses: actions/checkout@v4
42+
43+
- name: Set reusable strings
44+
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
45+
id: strings
46+
shell: bash
47+
run: |
48+
echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
49+
50+
- name: Configure CMake
51+
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
52+
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
53+
run: >
54+
cmake -B ${{ steps.strings.outputs.build-output-dir }}
55+
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
56+
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
57+
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
58+
-S ${{ github.workspace }}
59+
60+
- name: Build
61+
# Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
62+
run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
63+
64+
- name: Test
65+
working-directory: ${{ steps.strings.outputs.build-output-dir }}
66+
# Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
67+
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
68+
run: ctest --build-config ${{ matrix.build_type }}
69+
70+
lint:
71+
runs-on: ubuntu-latest
72+
steps:
73+
- uses: actions/checkout@v4
74+
- uses: arduino/arduino-lint-action@v2
75+
with:
76+
library-manager: update
77+
# compliance: strict

CMakeLists.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
cmake_minimum_required(VERSION 3.29)
2-
project(support_library)
1+
cmake_minimum_required(VERSION 3.28)
2+
project(cpp_components_library)
3+
4+
include(CTest)
35

46
set(CMAKE_CXX_STANDARD 11)
57

@@ -13,4 +15,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
1315
FetchContent_MakeAvailable(googletest)
1416

1517
add_subdirectory(src)
16-
add_subdirectory(test)
18+
19+
if (BUILD_TESTING)
20+
add_subdirectory(test)
21+
endif()

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=CppComponentsLibrary
2-
version=0.0.3
2+
version=0.0.6
33
author=Alexander Serebryakov <[email protected]>
44
maintainer=Alexander Serebryakov <[email protected]>
55
sentence=Components Library

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.29)
1+
cmake_minimum_required(VERSION 3.28)
22

33
add_library(api_library STATIC
44
HwApi.h

test/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
cmake_minimum_required(VERSION 3.29)
2-
31
set(CMAKE_CXX_STANDARD 20)
42

53
add_executable(
@@ -26,6 +24,7 @@ target_link_libraries(
2624
GTest::gmock_main
2725
)
2826

29-
enable_testing()
27+
#enable_testing()
3028

3129
gtest_discover_tests(cpp_components_test)
30+

0 commit comments

Comments
 (0)