# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1658939496 -7200
# Node ID ae3938c7eb6752e70dae192b2db9ab9463cb48bb
# Parent  929c05cf2afaaed081b5f955227a8ad6bd646966# Parent  6f4c8063b4c2bb0dfd3978be599e6e7b7911a993
maint: Merge stable to default.

diff -r 929c05cf2afa -r ae3938c7eb67 .github/workflows/make.yaml
--- a/.github/workflows/make.yaml	Wed Jul 27 13:27:00 2022 +0200
+++ b/.github/workflows/make.yaml	Wed Jul 27 18:31:36 2022 +0200
@@ -147,7 +147,7 @@
 
       matrix:
         # For available GitHub-hosted runners, see: https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
-        os: [macos-10.15, macos-11, macos-12]
+        os: [macos-11, macos-12]
         # Most (or all) homebrew packages are compiled with clang and link
         # against libc++.  So we also use clang to avoid issues with symbols
         # that don't match.