Skip to content

Commit 0baff2b

Browse files
authored
Merge pull request #11 from 7bitcoder/dev
update to ver 1.1.0
2 parents 0511d48 + 909b2cf commit 0baff2b

File tree

110 files changed

+3015
-1450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+3015
-1450
lines changed

.clang-tidy

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
3+
...
+17-15
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
11
name: Run CMake
22
description: "Runs CMake"
3+
34
inputs:
45
args:
56
description: "Other arguments"
67
required: false
78
default: -D_7BIT_CONF_BUILD_TESTS:BOOL=true -D_7BIT_CONF_BUILD_EXAMPLES:BOOL=true
8-
build-type:
9-
description: "Build type"
10-
required: false
11-
default: Release
12-
toolchain:
13-
description: "Toolchain file"
14-
required: false
15-
default: conan_toolchain.cmake
169
library-type:
1710
description: "Library type"
1811
required: false
1912
default: Static
20-
build-dir:
21-
description: "Build directory"
22-
required: true
2313

2414
runs:
2515
using: composite
2616
steps:
17+
- name: Set Proper Conan Profile
18+
uses: kanga333/[email protected]
19+
with:
20+
key: "${{ runner.os }}"
21+
map: |
22+
{
23+
"Windows":{
24+
"initPreset": "conan-default"
25+
},
26+
".*":{
27+
"initPreset": "conan-release"
28+
}
29+
}
30+
2731
- name: Configure CMake
28-
working-directory: ${{ inputs.build-dir }}
29-
run: cmake .. -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -D_7BIT_CONF_LIBRARY_TYPE=${{ inputs.library-type }} -DCMAKE_TOOLCHAIN_FILE:STRING="${{ inputs.toolchain }}" ${{ inputs.args }}
32+
run: cmake --preset ${{ env.initPreset }} -D_7BIT_CONF_LIBRARY_TYPE=${{ inputs.library-type }} ${{ inputs.args }}
3033
shell: pwsh
3134

3235
- name: Build
33-
working-directory: ${{ inputs.build-dir }}
34-
run: cmake --build . --config ${{ inputs.build-type }}
36+
run: cmake --build --preset conan-release
3537
shell: pwsh

.github/actions/conan-install/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ runs:
99
using: composite
1010
steps:
1111
- name: Install Conan
12-
uses: turtlebrowser/get-conan@main
12+
uses: turtlebrowser/get-conan@v1.2
1313

1414
- name: Set Proper Conan Profile
1515
uses: kanga333/[email protected]

.github/workflows/CI.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI
22

33
on:
44
push:
5-
branches: ["dev", "main"]
5+
branches: [ "dev", "main" ]
66
paths-ignore:
77
- ".readthedocs.yaml"
88
- "README.md"
@@ -16,26 +16,24 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
libraryType: [HeaderOnly, Static, Shared]
20-
os: [ubuntu-22.04, macos-12, windows-2022]
19+
libraryType: [ HeaderOnly, Static, Shared ]
20+
os: [ ubuntu-22.04, macos-12, windows-2022 ]
2121

2222
runs-on: ${{matrix.os}}
2323

2424
steps:
2525
- uses: actions/checkout@v3
2626

2727
- name: Install Conan Packages
28+
id: conan
2829
uses: ./.github/actions/conan-install
2930
with:
3031
install-dir: ${{ env.BUILD_DIR }}
3132

3233
- name: CMake Build
3334
uses: ./.github/actions/cmake-build
3435
with:
35-
build-dir: ${{ env.BUILD_DIR }}
36-
build-type: ${{ env.BUILD_TYPE }}
3736
library-type: ${{ matrix.libraryType }}
3837

3938
- name: Test
40-
working-directory: ${{ env.BUILD_DIR }}
41-
run: ctest -C ${{env.BUILD_TYPE}}
39+
run: ctest -j 10 --preset conan-release

.gitignore

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
/build
1+
/*build*
22
/.cache
33
/.vscode
4+
/.idea
45
.DS_Store
56
CmakeUserPresets.json
6-
CmakePresets.json
7+
conan_provider.cmake
8+
CmakePresets.json

7bitConf-logo.svg

+3-1
Loading

0 commit comments

Comments
 (0)