diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7e1bd54..296d006 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -18,13 +18,13 @@ jobs: build_type: "Release", cc: "cl", cxx: "cl", } - { - name: "Ubuntu 20.04 GCC Release", - os: ubuntu-20.04, + name: "Ubuntu 24.04 GCC Release", + os: ubuntu-24.04, build_type: "Release", cc: "gcc", cxx: "g++" } - { - name: "Ubuntu 20.04 Clang Release", - os: ubuntu-20.04, + name: "Ubuntu 24.04 Clang Release", + os: ubuntu-24.04, build_type: "Release", cc: "clang", cxx: "clang++" } - { @@ -38,8 +38,8 @@ jobs: build_type: "Release", cc: "clang", cxx: "clang++" } - { - name: "macOS 12 Clang Release", - os: macos-12, + name: "macOS 15 Clang Release", + os: macos-15, build_type: "Release", cc: "clang", cxx: "clang++" } - { @@ -48,13 +48,13 @@ jobs: build_type: "Debug", cc: "cl", cxx: "cl", } - { - name: "Ubuntu 20.04 GCC Debug", - os: ubuntu-20.04, + name: "Ubuntu 24.04 GCC Debug", + os: ubuntu-24.04, build_type: "Debug", cc: "gcc", cxx: "g++" } - { - name: "Ubuntu 20.04 Clang Debug", - os: ubuntu-20.04, + name: "Ubuntu 24.04 Clang Debug", + os: ubuntu-24.04, build_type: "Debug", cc: "clang", cxx: "clang++" } - { @@ -68,8 +68,8 @@ jobs: build_type: "Debug", cc: "clang", cxx: "clang++" } - { - name: "macOS 12 Clang Debug", - os: macos-12, + name: "macOS 15 Clang Debug", + os: macos-15, build_type: "Debug", cc: "clang", cxx: "clang++" } steps: diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3f6a183..8d3b2d5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -4,7 +4,7 @@ include(FetchContent) FetchContent_Declare( googletest GIT_REPOSITORY https://github.com/google/googletest.git - GIT_TAG release-1.11.0 + GIT_TAG v1.15.2 )