fix up CI:

add libhandy as dependency
change ubuntu actions environment
update nlohmann/json to latest release
add preprocessor checks
This commit is contained in:
ouwou
2022-11-08 02:32:45 -05:00
parent 28c3ec417f
commit f97a6ff266
3 changed files with 22 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
name: Abaddon CI
on: [push, pull_request]
on: [ push, pull_request ]
jobs:
msys2:
@@ -8,8 +8,8 @@ jobs:
runs-on: windows-latest
strategy:
matrix:
buildtype: [Debug, RelWithDebInfo, MinSizeRel]
mindeps: [false]
buildtype: [ Debug, RelWithDebInfo, MinSizeRel ]
mindeps: [ false ]
include:
- buildtype: RelWithDebInfo
mindeps: true
@@ -119,7 +119,7 @@ jobs:
runs-on: macos-latest
strategy:
matrix:
buildtype: [Debug, RelWithDebInfo]
buildtype: [ Debug, RelWithDebInfo ]
steps:
- uses: actions/checkout@v1
with:
@@ -136,6 +136,7 @@ jobs:
brew install opus
brew install libsodium
brew install spdlog
brew install libhandy
- name: Build
uses: lukka/run-cmake@v3
@@ -158,10 +159,10 @@ jobs:
linux:
name: linux-${{ matrix.buildtype }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
buildtype: [Debug, RelWithDebInfo, MinSizeRel]
buildtype: [ Debug, RelWithDebInfo, MinSizeRel ]
steps:
- uses: actions/checkout@v1
with:
@@ -177,7 +178,7 @@ jobs:
cd deps
git clone https://github.com/nlohmann/json
cd json
git checkout db78ac1d7716f56fc9f1b030b715f872f93964e4
git checkout bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
mkdir build
cd build
cmake ..
@@ -188,6 +189,7 @@ jobs:
sudo apt-get install libopus-dev
sudo apt-get install libsodium-dev
sudo apt-get install libspdlog-dev
sudo apt-get install libhandy-1-dev
- name: Build
uses: lukka/run-cmake@v3

View File

@@ -1,5 +1,11 @@
#ifdef WITH_VOICE
// clang-format off
#include "devices.hpp"
// clang-format on
AudioDevices::AudioDevices()
: m_playback(Gtk::ListStore::create(m_playback_columns)) {
}
@@ -31,3 +37,4 @@ AudioDevices::PlaybackColumns::PlaybackColumns() {
add(Name);
add(DeviceID);
}
#endif

View File

@@ -1,9 +1,14 @@
#pragma once
#ifdef WITH_VOICE
// clang-format off
#include <gtkmm/liststore.h>
#include <miniaudio.h>
#include <optional>
// clang-format on
class AudioDevices {
public:
AudioDevices();
@@ -24,3 +29,4 @@ private:
PlaybackColumns m_playback_columns;
Glib::RefPtr<Gtk::ListStore> m_playback;
};
#endif