From f97a6ff266881936c2885c3265ae20524d66c874 Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Tue, 8 Nov 2022 02:32:45 -0500
Subject: fix up CI: add libhandy as dependency change ubuntu actions
 environment update nlohmann/json to latest release add preprocessor checks

---
 .github/workflows/ci.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9a16289..be2c5a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
-- 
cgit v1.2.3