From 6cab790bee462f509159244f2780aeba775d3125 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Wed, 4 Jun 2025 14:31:07 -0400 Subject: [PATCH 1/3] fix: Bump redis-plus-plus to v1.3.14 gcc no longer transitively includes . This resulted in a break in redis-plus-plus, which is fixed in v1.3.8. But in true in-for-a-penny fashion, we are going to update to the latest version. --- cmake/redis-plus-plus.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/redis-plus-plus.cmake b/cmake/redis-plus-plus.cmake index 49572b27f..a5e9fc9af 100644 --- a/cmake/redis-plus-plus.cmake +++ b/cmake/redis-plus-plus.cmake @@ -18,11 +18,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps) set(REDIS_PLUS_PLUS_BUILD_TEST OFF CACHE BOOL "" FORCE) -# 1.3.7 is the last release that works with FetchContent, due to a problem with CheckSymbolExists -# when it tries to do feature detection on hiredis. FetchContent_Declare(redis-plus-plus GIT_REPOSITORY https://github.com/sewenew/redis-plus-plus.git - GIT_TAG 1.3.7 + GIT_TAG 1.3.14 GIT_SHALLOW TRUE ) From d16ad68c3eead47b9cf002a6a5ce964888c0a5f2 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Wed, 4 Jun 2025 15:32:42 -0400 Subject: [PATCH 2/3] downgrade ubuntu --- .github/workflows/manual-publish-doc.yml | 2 +- .github/workflows/manual-sdk-release-artifacts.yml | 4 ++-- .github/workflows/release-please.yml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/manual-publish-doc.yml b/.github/workflows/manual-publish-doc.yml index 4c7a8a553..2c15eabb4 100644 --- a/.github/workflows/manual-publish-doc.yml +++ b/.github/workflows/manual-publish-doc.yml @@ -13,7 +13,7 @@ on: name: Publish Documentation jobs: build-publish: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - run: sudo apt-get install doxygen graphviz diff --git a/.github/workflows/manual-sdk-release-artifacts.yml b/.github/workflows/manual-sdk-release-artifacts.yml index 655754875..a4cd4745f 100644 --- a/.github/workflows/manual-sdk-release-artifacts.yml +++ b/.github/workflows/manual-sdk-release-artifacts.yml @@ -21,7 +21,7 @@ name: Publish SDK Artifacts jobs: split-input: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: sdk_path: ${{ steps.split-string.outputs.SDK_PATH }} sdk_cmake_target: ${{ steps.split-string.outputs.SDK_CMAKE_TARGET }} @@ -38,7 +38,7 @@ jobs: strategy: matrix: # Each of the platforms for which release-artifacts need generated. - os: [ ubuntu-latest, windows-2022, macos-13 ] + os: [ ubuntu-22.04, windows-2022, macos-13 ] runs-on: ${{ matrix.os }} outputs: hashes-linux: ${{ steps.release-sdk.outputs.hashes-linux }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index e6718c154..6a4845aa9 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -6,7 +6,7 @@ name: release-please jobs: release-please: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: package-client-released: ${{ steps.release.outputs['libs/client-sdk--release_created'] }} package-client-tag: ${{ steps.release.outputs['libs/client-sdk--tag_name'] }} @@ -24,7 +24,7 @@ jobs: strategy: matrix: # Each of the platforms for which release-artifacts need generated. - os: [ ubuntu-latest, windows-2022, macos-13 ] + os: [ ubuntu-22.04, windows-2022, macos-13 ] runs-on: ${{ matrix.os }} needs: [ 'release-please' ] if: ${{ needs.release-please.outputs.package-client-released == 'true'}} @@ -48,7 +48,7 @@ jobs: strategy: matrix: # Each of the platforms for which release-artifacts need generated. - os: [ ubuntu-latest, windows-2022, macos-13 ] + os: [ ubuntu-22.04, windows-2022, macos-13 ] runs-on: ${{ matrix.os }} needs: [ 'release-please' ] if: ${{ needs.release-please.outputs.package-server-released == 'true'}} @@ -72,7 +72,7 @@ jobs: strategy: matrix: # Each of the platforms for which release-artifacts need generated. - os: [ ubuntu-latest, windows-2022, macos-13 ] + os: [ ubuntu-22.04, windows-2022, macos-13 ] runs-on: ${{ matrix.os }} needs: [ 'release-please' ] if: ${{ needs.release-please.outputs.package-server-redis-released == 'true'}} From 7659e65b32f0186329384ed5bd8d6bec3e503611 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Wed, 4 Jun 2025 15:35:12 -0400 Subject: [PATCH 3/3] Revert "fix: Bump redis-plus-plus to v1.3.14" This reverts commit 6cab790bee462f509159244f2780aeba775d3125. --- cmake/redis-plus-plus.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/redis-plus-plus.cmake b/cmake/redis-plus-plus.cmake index a5e9fc9af..49572b27f 100644 --- a/cmake/redis-plus-plus.cmake +++ b/cmake/redis-plus-plus.cmake @@ -18,9 +18,11 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/_deps) set(REDIS_PLUS_PLUS_BUILD_TEST OFF CACHE BOOL "" FORCE) +# 1.3.7 is the last release that works with FetchContent, due to a problem with CheckSymbolExists +# when it tries to do feature detection on hiredis. FetchContent_Declare(redis-plus-plus GIT_REPOSITORY https://github.com/sewenew/redis-plus-plus.git - GIT_TAG 1.3.14 + GIT_TAG 1.3.7 GIT_SHALLOW TRUE )