Skip to content

Commit e945faa

Browse files
author
Aliaksandr Adziareika
committed
Adapt to centralized preset generation in reusable workflow
1 parent 6f87996 commit e945faa

2 files changed

Lines changed: 5 additions & 95 deletions

File tree

.github/workflows/module-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ jobs:
1515
uses: openDAQ/actions/.github/workflows/reusable-module-ci.yml@jira/TBBAS-3013-resusable-workflow-ci-module
1616
with:
1717
opendaq-ref: ${{ github.event.inputs.opendaq-ref || '' }}
18+
exclude-configs: '["macos-*"]'
1819
packages: >
1920
[
2021
{
21-
"preset-pattern": "ci-build-ubuntu-*",
22+
"runners": ["ubuntu-*"],
2223
"packages": {"apt": ["libpcap-dev"]}
2324
}
2425
]

CMakePresets.json

Lines changed: 3 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -2,107 +2,16 @@
22
"version": 4,
33
"configurePresets": [
44
{
5-
"name": "ci",
6-
"hidden": true,
7-
"binaryDir": "build/${presetName}",
5+
"name": "module",
86
"cacheVariables": {
97
"ASAM_CMP_ENABLE_EXAMPLE": false
108
}
11-
},
12-
{
13-
"name": "ci-build-type-release",
14-
"hidden": true,
15-
"cacheVariables": {
16-
"CMAKE_BUILD_TYPE": "Release"
17-
}
18-
},
19-
{
20-
"name": "ci-build-type-debug",
21-
"hidden": true,
22-
"cacheVariables": {
23-
"CMAKE_BUILD_TYPE": "Debug"
24-
}
25-
},
26-
{
27-
"name": "ci-build-ubuntu-latest-release",
28-
"displayName": "CI Ubuntu Release",
29-
"inherits": ["ci", "ci-build-type-release"],
30-
"generator": "Ninja"
31-
},
32-
{
33-
"name": "ci-generator-msvc",
34-
"hidden": true,
35-
"generator": "Visual Studio 17 2022",
36-
"architecture": "x64"
37-
},
38-
{
39-
"name": "ci-build-windows-latest-release",
40-
"displayName": "CI Windows Release",
41-
"inherits": ["ci", "ci-generator-msvc"]
42-
},
43-
{
44-
"name": "ci-build-ubuntu-latest-debug",
45-
"displayName": "CI Ubuntu Debug",
46-
"inherits": ["ci", "ci-build-type-debug"],
47-
"generator": "Ninja"
48-
},
49-
{
50-
"name": "ci-build-windows-latest-debug",
51-
"displayName": "CI Windows Debug",
52-
"inherits": ["ci", "ci-generator-msvc"]
53-
}
54-
],
55-
"buildPresets": [
56-
{
57-
"name": "ci-build-ubuntu-latest-release",
58-
"configurePreset": "ci-build-ubuntu-latest-release",
59-
"configuration": "Release"
60-
},
61-
{
62-
"name": "ci-build-windows-latest-release",
63-
"configurePreset": "ci-build-windows-latest-release",
64-
"configuration": "Release"
65-
},
66-
{
67-
"name": "ci-build-ubuntu-latest-debug",
68-
"configurePreset": "ci-build-ubuntu-latest-debug",
69-
"configuration": "Debug"
70-
},
71-
{
72-
"name": "ci-build-windows-latest-debug",
73-
"configurePreset": "ci-build-windows-latest-debug",
74-
"configuration": "Debug"
759
}
7610
],
7711
"testPresets": [
7812
{
79-
"name": "ci-test-ubuntu-latest-release",
80-
"configurePreset": "ci-build-ubuntu-latest-release",
81-
"configuration": "Release",
82-
"output": {
83-
"outputOnFailure": true
84-
}
85-
},
86-
{
87-
"name": "ci-test-windows-latest-release",
88-
"configurePreset": "ci-build-windows-latest-release",
89-
"configuration": "Release",
90-
"output": {
91-
"outputOnFailure": true
92-
}
93-
},
94-
{
95-
"name": "ci-test-ubuntu-latest-debug",
96-
"configurePreset": "ci-build-ubuntu-latest-debug",
97-
"configuration": "Debug",
98-
"output": {
99-
"outputOnFailure": true
100-
}
101-
},
102-
{
103-
"name": "ci-test-windows-latest-debug",
104-
"configurePreset": "ci-build-windows-latest-debug",
105-
"configuration": "Debug",
13+
"name": "module-test",
14+
"configurePreset": "module",
10615
"output": {
10716
"outputOnFailure": true
10817
}

0 commit comments

Comments
 (0)