Skip to content

Commit 27c30f0

Browse files
committed
try fix CI
1 parent f6b7609 commit 27c30f0

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

.github/actions/cmake-build/action.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ inputs:
1313
description: "Toolchain file"
1414
required: false
1515
default: conan_toolchain.cmake
16-
library-type:
17-
description: "Library type"
16+
shared-lib:
17+
description: "Shared lib"
1818
required: false
19-
default: "Static"
19+
default: "OFF"
2020
build-dir:
2121
description: "Build directory"
2222
required: true
@@ -26,22 +26,7 @@ runs:
2626
steps:
2727
- name: Configure CMake
2828
working-directory: ${{ inputs.library-type }}
29-
with:
30-
key: "${{ inputs.build-type }}"
31-
map: |
32-
{
33-
"Static": {
34-
"args": ""
35-
},
36-
"Shared": {
37-
"args": "-DSEVEN_BIT_DI_BUILD_SHARED=ON"
38-
},
39-
"HeaderOnly": {
40-
"args": "-DSEVEN_BIT_DI_BUILD_TESTS_HO:BOOL=ON -DSEVEN_BIT_DI_BUILD_EXAMPLES_HO:BOOL=ON"
41-
}
42-
}
43-
export_to: env
44-
run: cmake .. -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} .env.$args -DCMAKE_TOOLCHAIN_FILE:STRING="${{ inputs.toolchain }}" -DBUILD_TESTS:BOOL=true -DBUILD_EXAMPLES:BOOL=true ${{ inputs.args }}
29+
run: cmake .. -DCMAKE_BUILD_TYPE=${{ inputs.build-type }} -DSEVEN_BIT_DI_BUILD_SHARED=${{ inputs.shared-lib }} -DCMAKE_TOOLCHAIN_FILE:STRING="${{ inputs.toolchain }}" -DBUILD_TESTS:BOOL=true -DBUILD_EXAMPLES:BOOL=true ${{ inputs.args }}
4530
shell: pwsh
4631

4732
- name: Build

.github/workflows/DevCI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
library-type: [HeaderOnly, Static, Shared]
20+
shared-lib: ["ON", "OFF"]
2121
os: [ubuntu-22.04, macos-12, windows-2022]
2222

2323
runs-on: ${{matrix.os}}
@@ -35,7 +35,7 @@ jobs:
3535
with:
3636
build-dir: ${{ env.BUILD_DIR }}
3737
build-type: ${{ env.BUILD_TYPE }}
38-
library-type: ${{ matrix.library-type }}
38+
shared-lib: ${{ matrix.shared-lib }}
3939

4040
- name: Test
4141
working-directory: ${{ env.BUILD_DIR }}

0 commit comments

Comments
 (0)