Skip to content

Commit 4c44aaa

Browse files
authored
Merge branch 'sccn:dev' into master
2 parents 9e3823b + ec8e8de commit 4c44aaa

20 files changed

+532
-398
lines changed

.github/workflows/cppcmake.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
-DCMAKE_INSTALL_PREFIX=${PWD}/install \
6363
-DLSL_UNITTESTS=ON \
6464
-DLSL_BENCHMARKS=ON \
65-
-DLSL_BUILD_EXAMPLES=ON \
6665
-DCPACK_PACKAGE_DIRECTORY=${PWD}/package \
6766
-Dlslgitrevision=${{ github.sha }} \
6867
-Dlslgitbranch=${{ github.ref }} \
@@ -71,6 +70,18 @@ jobs:
7170
echo ${PWD}
7271
- name: make
7372
run: cmake --build build --target install --config Release -j
73+
74+
- name: test install using examples
75+
run: |
76+
# Test that the in-tree install was successful by building the examples
77+
cmake -S examples -B examples/build \
78+
-DLSL_INSTALL_ROOT=${PWD}/install \
79+
-DCMAKE_INSTALL_PREFIX=examples/build/install \
80+
-DLSL_COMFY_DEFAULTS=ON \
81+
${{ matrix.config.cmake_extra }} \
82+
${{ github.event.inputs.cmakeextra }}
83+
cmake --build examples/build --target install --config Release -j
84+
./examples/build/install/bin/HandleMetaData
7485
7586
- name: package
7687
run: |

.github/workflows/mingw_static.yml

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@ on:
44
push:
55
branches: ['*']
66
paths:
7-
- '**'
8-
- '!docs/**'
9-
- '!.github/**'
7+
- 'src'
8+
- 'include'
9+
- 'cmake'
10+
# - '!docs/**'
11+
# - '!.github/**'
1012
- '.github/workflows/mingw_static.yml'
1113
pull_request:
14+
workflow_dispatch:
1215

1316
concurrency:
1417
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -17,30 +20,43 @@ concurrency:
1720
jobs:
1821
build:
1922
name: MinGW batteries-included
20-
runs-on: windows-2019
21-
23+
strategy:
24+
matrix:
25+
include:
26+
# - { sys: mingw64, env: x86_64 }
27+
# - { sys: mingw32, env: i686 }
28+
- { sys: ucrt64, env: ucrt-x86_64 }
29+
# - { sys: clang64, env: clang-x86_64 }
30+
runs-on: windows-latest
2231
defaults:
2332
run:
2433
shell: 'msys2 {0}'
25-
2634
steps:
2735
- uses: actions/checkout@v4
2836
- uses: msys2/setup-msys2@v2
2937
with:
30-
release: false
38+
msystem: ${{matrix.sys}}
39+
update: true
40+
cache: true
41+
install: >-
42+
git
43+
make
44+
pacboy: >-
45+
toolchain:p
46+
cmake:p
47+
ninja:p
3148
- name: Configure CMake
3249
run: |
3350
cmake --version
3451
cmake -S . -B build \
3552
-DCMAKE_BUILD_TYPE=Release \
3653
-DCMAKE_INSTALL_PREFIX=${PWD}/install \
3754
-DLSL_UNITTESTS=ON \
38-
-DLSL_BUILD_EXAMPLES=ON \
3955
-DLSL_BUILD_STATIC=ON \
4056
-Dlslgitrevision=${{ github.sha }} \
4157
-Dlslgitbranch=${{ github.ref }} \
4258
-DLSL_OPTIMIZATIONS=OFF \
43-
-G 'MSYS Makefiles'
59+
-G Ninja
4460
4561
- name: make
4662
run: cmake --build build --target install --config Release -j --verbose

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
# CLion
1414
.idea/
1515
/cmake-build-*/
16+
/examples/build*/

.travis.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)