Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix various pipeline failures #1172

Merged
merged 12 commits into from
Nov 25, 2024
Merged

fix various pipeline failures #1172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d71d522
fix failing macos test
carsonRadtke Nov 15, 2024
ed2ec20
Set cmake_minimum_required to 3.10
carsonRadtke Nov 15, 2024
6080917
update googletest to v1.15.2
carsonRadtke Nov 15, 2024
8d6c047
use googletest v1.14.0
carsonRadtke Nov 15, 2024
afc2b09
Merge branch 'fix-macos-pipeline' into fix-cmake-min-version
carsonRadtke Nov 15, 2024
ed21da6
looks like xcode 16.1 support is not coming soon
carsonRadtke Nov 25, 2024
c0a4f04
suppress incorrect warning when compiling gtest
carsonRadtke Nov 25, 2024
d334a4f
google test does not work with gcc12
carsonRadtke Nov 25, 2024
56f197d
disable deprecated errors for android
carsonRadtke Nov 25, 2024
373a18c
undo deleted space
carsonRadtke Nov 25, 2024
916375d
fix typo gcc excludes
carsonRadtke Nov 25, 2024
ddc5690
remove warnings from cmake android. we have no control over the conte…
carsonRadtke Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
echo "Emulator starting in background"

- name: Configure
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 ..
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actions/runner-images claims that cmake version 3.22.1 ships with Android on macos-14, but I couldn't find it. I would prefer using the builtin one (and keep the -Werror=dev flag), but at the end of the day we control neither the image nor the cmake file so removing the dev flag is fine.

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 ..

- name: Build
run: cmake --build . --parallel
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/compilers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ jobs:
exclude:
- gcc_version: 10
cxx_version: 23
# https://github.com/google/googletest/issues/4232
# Looks like GoogleTest is not interested in making version 1.14
# work with gcc-12.
- gcc_version: 12
cxx_version: 20
- gcc_version: 12
cxx_version: 23
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -54,7 +61,7 @@ jobs:
xcode:
strategy:
matrix:
xcode_version: [ '14.3.1', '15.4' ]
xcode_version: [ '15.4' ]
build_type: [ Debug, Release ]
cxx_version: [ 14, 17, 20, 23 ]
runs-on: macos-latest
Expand Down
1 change: 1 addition & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ if(MSVC) # MSVC or simulating MSVC
-Wno-shift-sign-overflow # GTest gtest-port.h
-Wno-undef # GTest
-Wno-used-but-marked-unused # GTest EXPECT_DEATH
-Wno-switch-default # GTest EXPECT_DEATH
$<$<EQUAL:${GSL_CXX_STANDARD},14>: # no support for [[maybe_unused]]
-Wno-unused-member-function
-Wno-unused-variable
Expand Down
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0.2)
cmake_minimum_required(VERSION 3.13)
project(googletest-download NONE)

include(ExternalProject)
ExternalProject_Add(googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG 1b18723e874b256c1e39378c6774a90701d70f7a
GIT_TAG v1.14.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the latest version, but v1.15 is incompatible with -std=c++14.

SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
CONFIGURE_COMMAND ""
Expand Down