Skip to content

Commit 2ee2f39

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

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
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: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,22 @@ jobs:
4141

4242
- name: Configure simple device module with CMake Windows
4343
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
44+
run: cmake -B build/output -S . -G "Visual Studio 17 2022" -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
4545

46-
- name: Build simple device module with CMake Windows
47-
if: runner.os == 'Windows'
48-
run: cmake --build build/output --config Release
49-
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
46+
# - name: Build simple device module with CMake
47+
# # if: runner.os == 'Windows'
48+
# run: cmake --build build/output --config Release
5649

5750
- name: Configure simple device module with CMake
5851
if: runner.os != 'Windows'
5952
run: cmake -B build/output -S . -G Ninja -DEXAMPLE_MODULE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=Release
6053

54+
# - name: Build simple device module with CMake
55+
# if: runner.os != 'Windows'
56+
# run: cmake --build build/output --target all
57+
6158
- name: Build simple device module with CMake
62-
if: runner.os != 'Windows'
63-
run: cmake --build build/output --target all
59+
run: cmake --build build/output --config Release
6460

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

0 commit comments

Comments
 (0)