Skip to content

Commit 74d2bb7

Browse files
authored
fix various pipeline failures (#1172)
* fix failing pipeline tests * upgrade to googletest v1.14.0 so it works with newer cmake versions * fix android pipeline to permit new cmake versions (short-term fix)
1 parent f8ec309 commit 74d2bb7

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
echo "Emulator starting in background"
3939
4040
- name: Configure
41-
run: cmake -Werror=dev -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=16 -DANDROID_ABI=x86_64 -DCMAKE_BUILD_TYPE=Debug ..
41+
run: cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=16 -DANDROID_ABI=x86_64 -DCMAKE_BUILD_TYPE=Debug ..
4242

4343
- name: Build
4444
run: cmake --build . --parallel

.github/workflows/compilers.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ jobs:
2323
exclude:
2424
- gcc_version: 10
2525
cxx_version: 23
26+
# https://github.com/google/googletest/issues/4232
27+
# Looks like GoogleTest is not interested in making version 1.14
28+
# work with gcc-12.
29+
- gcc_version: 12
30+
cxx_version: 20
31+
- gcc_version: 12
32+
cxx_version: 23
2633
runs-on: ubuntu-latest
2734
steps:
2835
- uses: actions/checkout@v4
@@ -54,7 +61,7 @@ jobs:
5461
xcode:
5562
strategy:
5663
matrix:
57-
xcode_version: [ '14.3.1', '15.4' ]
64+
xcode_version: [ '15.4' ]
5865
build_type: [ Debug, Release ]
5966
cxx_version: [ 14, 17, 20, 23 ]
6067
runs-on: macos-latest

tests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ if(MSVC) # MSVC or simulating MSVC
110110
-Wno-shift-sign-overflow # GTest gtest-port.h
111111
-Wno-undef # GTest
112112
-Wno-used-but-marked-unused # GTest EXPECT_DEATH
113+
-Wno-switch-default # GTest EXPECT_DEATH
113114
$<$<EQUAL:${GSL_CXX_STANDARD},14>: # no support for [[maybe_unused]]
114115
-Wno-unused-member-function
115116
-Wno-unused-variable

tests/CMakeLists.txt.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.13)
22
project(googletest-download NONE)
33

44
include(ExternalProject)
55
ExternalProject_Add(googletest
66
GIT_REPOSITORY https://github.com/google/googletest.git
7-
GIT_TAG 1b18723e874b256c1e39378c6774a90701d70f7a
7+
GIT_TAG v1.14.0
88
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
99
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
1010
CONFIGURE_COMMAND ""

0 commit comments

Comments
 (0)