Skip to content

Commit f16fea1

Browse files
Merge pull request #883 from lethal-guitar/test-macos-11
Upgrade Mac OS CI
2 parents 64447b2 + 2836de7 commit f16fea1

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

.github/workflows/bundling.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
name: ubuntu_deb_build
3232
path: build/packages/*.deb*
3333
build_package_osx:
34-
runs-on: macos-10.15
34+
runs-on: macos-11
3535
steps:
3636
- uses: actions/checkout@v2
3737
with:

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
- name: Test (release)
7474
run: cd build && ctest
7575
build_osx:
76-
runs-on: macos-10.15
76+
runs-on: macos-11
7777
steps:
7878
- uses: actions/checkout@v2
7979
with:

benchmark/bench_string_utils.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1515
*/
1616

17-
#include <benchmark/benchmark.h>
18-
1917
#include <base/string_utils.hpp>
18+
#include <base/warnings.hpp>
19+
20+
RIGEL_DISABLE_WARNINGS
21+
#include <benchmark/benchmark.h>
22+
RIGEL_RESTORE_WARNINGS
2023

2124

2225
static void BMStringSplit(benchmark::State& state)

src/base/warnings.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
_Pragma("clang diagnostic ignored \"-Wgnu-anonymous-struct\"") \
6161
_Pragma("clang diagnostic ignored \"-Wnested-anon-types\"") \
6262
_Pragma("clang diagnostic ignored \"-Wextra-semi-stmt\"") \
63+
_Pragma("clang diagnostic ignored \"-Wsuggest-override\"") \
6364
/**/
6465

6566
#define RIGEL_RESTORE_WARNINGS _Pragma("clang diagnostic pop")

0 commit comments

Comments
 (0)