Skip to content

Commit 4fa6a6b

Browse files
author
Aliaksandr Adziareika
committed
<TBBAS-2530> Unify cmake configure step
1 parent eaa4f8b commit 4fa6a6b

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

.github/actions/framework-download/action.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,3 @@ runs:
4848
$src = "${{ inputs.src-opendaq-framework-dev }}"
4949
Write-Host "Downloading $src to $dst"
5050
aws s3 cp "$src" "$dst"
51-
52-
- name: Upload Windows installer as artifact
53-
if: runner.os == 'Windows'
54-
uses: actions/upload-artifact@v4
55-
with:
56-
name: opendaq-installer
57-
path: ${{ inputs.dst-opendaq-framework-dev }}

.github/workflows/ci.yml

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,16 @@ env:
1111

1212
jobs:
1313
build-and-test:
14-
runs-on: ${{ matrix.os }}
1514

1615
strategy:
1716
matrix:
18-
os: [ubuntu-latest, windows-latest]
17+
include:
18+
- os: ubuntu-latest
19+
generator: Ninja
20+
- os: windows-latest
21+
generator: "Visual Studio 17 2022"
22+
23+
runs-on: ${{ matrix.os }}
1924

2025
steps:
2126
- name: Checkout simple device module repo
@@ -39,28 +44,28 @@ jobs:
3944
with:
4045
opendaq-framework-package-filename: ${{ steps.opendaq-framework.outputs.artefact }}
4146

42-
- name: Configure simple device module with CMake Windows
43-
if: runner.os == 'Windows'
44-
run: cmake -B build/output -S . -G "Visual Studio 17 2022" -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DOPENDAQ_MSVC_SINGLE_PROCESS_BUILD=ON -DDAQMODULES_PARQUET_RECORDER_MODULE=ON -DCMAKE_BUILD_TYPE=Release
47+
# - name: Configure simple device module with CMake Windows
48+
# if: runner.os == 'Windows'
49+
# run: cmake -B build/output -S . -G "Visual Studio 17 2022" -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
4550

46-
- name: Build simple device module with CMake Windows
47-
if: runner.os == 'Windows'
48-
run: cmake --build build/output --config Release
51+
# - name: Build simple device module with CMake
52+
# # if: runner.os == 'Windows'
53+
# run: cmake --build build/output --config Release
4954

50-
# - name: Run simple device module tests via CTest with GTest report Windows
51-
# if: runner.os == 'Windows'
52-
# run: |
53-
# New-Item -ItemType Directory -Force -Path build/reports | Out-Null
54-
# $env:GTEST_OUTPUT = "xml:$PWD/build/reports/gtest-report.xml"
55-
# ctest --test-dir build/output --output-on-failure -C Release -V
55+
# - name: Configure simple device module with CMake
56+
# if: runner.os != 'Windows'
57+
# run: cmake -B build/output -S . -G Ninja -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
58+
59+
# - name: Build simple device module with CMake
60+
# if: runner.os != 'Windows'
61+
# run: cmake --build build/output --target all
5662

5763
- name: Configure simple device module with CMake
58-
if: runner.os != 'Windows'
59-
run: cmake -B build/output -S . -G Ninja -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
60-
64+
run: cmake -B build/output -S . -G "${{ matrix.generator }}" -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
65+
66+
6167
- name: Build simple device module with CMake
62-
if: runner.os != 'Windows'
63-
run: cmake --build build/output --target all
68+
run: cmake --build build/output --config Release
6469

65-
- name: Run simple device module tests via CTest with GTest report
70+
- name: Run simple device module tests with CMake
6671
run: ctest --test-dir build/output --output-on-failure -C Release -V

0 commit comments

Comments
 (0)