Merge pull request #883 from lethal-guitar/test-macos-11

Upgrade Mac OS CI
lethal-guitar · Oct 8, 2022 · f16fea1 · f16fea1
2 parents 64447b2 + 2836de7
commit f16fea1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/bundling.yml b/.github/workflows/bundling.yml
@@ -31,7 +31,7 @@ jobs:
         name: ubuntu_deb_build
         path: build/packages/*.deb*
   build_package_osx:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
     - uses: actions/checkout@v2
       with:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -73,7 +73,7 @@ jobs:
     - name: Test (release)
       run: cd build && ctest
   build_osx:
-    runs-on: macos-10.15
+    runs-on: macos-11
     steps:
     - uses: actions/checkout@v2
       with:

diff --git a/benchmark/bench_string_utils.cpp b/benchmark/bench_string_utils.cpp
@@ -14,9 +14,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <benchmark/benchmark.h>
-
 #include <base/string_utils.hpp>
+#include <base/warnings.hpp>
+
+RIGEL_DISABLE_WARNINGS
+#include <benchmark/benchmark.h>
+RIGEL_RESTORE_WARNINGS
 
 
 static void BMStringSplit(benchmark::State& state)

diff --git a/src/base/warnings.hpp b/src/base/warnings.hpp
@@ -60,6 +60,7 @@
     _Pragma("clang diagnostic ignored \"-Wgnu-anonymous-struct\"")               \
     _Pragma("clang diagnostic ignored \"-Wnested-anon-types\"")                  \
     _Pragma("clang diagnostic ignored \"-Wextra-semi-stmt\"")                    \
+    _Pragma("clang diagnostic ignored \"-Wsuggest-override\"")                   \
     /**/
 
   #define RIGEL_RESTORE_WARNINGS _Pragma("clang diagnostic pop")