From 8a349e17afccf96db999012f2cb6d32864c1d1fc Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Wed, 9 Mar 2022 09:44:15 +0000
Subject: [PATCH] Include macos-10.15 and macos-11 in CI builds

---
 .github/workflows/main.yml | 14 ++++++++++++++
 contrib/ci/build_macos.sh  | 14 ++++++++++++++
 subprojects/libjcat.wrap   |  2 +-
 subprojects/libxmlb.wrap   |  2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100755 contrib/ci/build_macos.sh

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3885554ff..651275174 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -71,6 +71,20 @@ jobs:
           echo $GITHUB_WORKSPACE
           docker run --privileged -e CI=true -t -v $GITHUB_WORKSPACE:/github/workspace docker.pkg.github.com/fwupd/fwupd/fwupd-${{matrix.os}}:latest
 
+  macos:
+    strategy:
+      matrix:
+        os: [ macos-10.15, macos-11 ]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: install dependencies
+      run: brew install meson gcab libusb gobject-introspection sqlite libarchive json-glib curl gnutls protobuf-c vala
+    - uses: actions/checkout@v2
+    - name: configure
+      run: ./contrib/ci/build_macos.sh
+    - name: build
+      run: ninja -C build-macos
+
   fuzzing:
     runs-on: ubuntu-latest
     timeout-minutes: 20
diff --git a/contrib/ci/build_macos.sh b/contrib/ci/build_macos.sh
new file mode 100755
index 000000000..f2daeb566
--- /dev/null
+++ b/contrib/ci/build_macos.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+set -x
+
+mkdir -p build-macos && cd build-macos
+meson .. \
+    -Dbuild=standalone \
+    -Ddocs=none \
+    -Dhsi=false \
+    -Dsoup_session_compat=false \
+    -Dgusb:docs=false \
+    -Dlibjcat:gpg=false \
+    -Dlibxmlb:gtkdoc=false \
+    $@
diff --git a/subprojects/libjcat.wrap b/subprojects/libjcat.wrap
index 7efadcdac..ca4683054 100644
--- a/subprojects/libjcat.wrap
+++ b/subprojects/libjcat.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory = libjcat
 url = https://github.com/hughsie/libjcat.git
-revision = 0.1.9
+revision = 0.1.11
diff --git a/subprojects/libxmlb.wrap b/subprojects/libxmlb.wrap
index 716f35e40..5d44449dd 100644
--- a/subprojects/libxmlb.wrap
+++ b/subprojects/libxmlb.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 directory = libxmlb
 url = https://github.com/hughsie/libxmlb.git
-revision = 0.3.6
+revision = 0.3.8