Skip to content

Commit 258dae4

Browse files
committed
ci: more fixes
1 parent 23444d7 commit 258dae4

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

.github/workflows/build_cmake.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ jobs:
200200
cmake --build build --config Debug --target install
201201
202202
- name: Test
203-
if: matrix.config.name != 'Tarball' && matrix.config.name != 'iOS'
203+
if: matrix.config.name != 'Tarball' && matrix.config.name != 'iOS' && matrix.library_mode != 'MODULE'
204204
run: |
205205
# Not available on GH actions...
206206
# if [ "$RUNNER_OS" == "Linux" ]; then
@@ -225,6 +225,7 @@ jobs:
225225
- uses: vmactions/freebsd-vm@v1
226226
with:
227227
usesh: true
228+
228229
prepare: |
229230
pkg install -y jackit boost-libs cmake git ninja
230231
@@ -235,7 +236,7 @@ jobs:
235236
env
236237
freebsd-version
237238
CMAKE_GENERATOR=
238-
if [[ "${{ matrix.library_mode }}" == "MODULE" ]]; then
239+
if [ "${{ matrix.library_mode }}" = "MODULE" ]; then
239240
CMAKE_GENERATOR=-GNinja
240241
fi
241242
@@ -250,8 +251,10 @@ jobs:
250251
-DCMAKE_INSTALL_PREFIX=install
251252
252253
cmake --build build
253-
cmake --build build --target install
254-
cmake --build build --target test
254+
if [ "${{ matrix.library_mode }}" != "MODULE" ]; then
255+
cmake --build build --target install
256+
cmake --build build --target test
257+
fi
255258
256259
build_debian:
257260
name: Debian ${{ matrix.distro }} ${{ matrix.library_mode }} ${{ matrix.boost && 'Boost' }}
@@ -327,6 +330,7 @@ jobs:
327330
cmake --build build --config Debug --target install
328331
329332
- name: Test
333+
if: matrix.library_mode != 'MODULE'
330334
run: |
331335
cmake --build build --config Debug --target test
332336

examples/utils.hpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,25 @@
1818

1919
inline std::ostream& operator<<(std::ostream& s, libremidi::port_information::port_type t)
2020
{
21-
using enum libremidi::port_information::port_type;
22-
if (t & software)
21+
if (t & libremidi::transport_type::software)
2322
{
2423
s << "software";
25-
if (t & loopback)
24+
if (t & libremidi::transport_type::loopback)
2625
s << ", loopback";
2726
}
2827

29-
if (t & hardware)
28+
if (t & libremidi::transport_type::hardware)
3029
{
3130
s << "hardware";
32-
if (t & usb)
31+
if (t & libremidi::transport_type::usb)
3332
s << ", usb";
34-
if (t & bluetooth)
33+
if (t & libremidi::transport_type::bluetooth)
3534
s << ", bt";
36-
if (t & pci)
35+
if (t & libremidi::transport_type::pci)
3736
s << ", pci";
3837
}
3938

40-
if (t & network)
39+
if (t & libremidi::transport_type::network)
4140
s << "network";
4241
return s;
4342
}

0 commit comments

Comments
 (0)