chore: Add additional CI configurations. (#35)

Author: kinyoklion

.github/actions/ci/action.yml

@@ -14,18 +14,22 @@ inputs:
     description: 'Whether gtest targets should be built & run.'
     required: false
     default: 'true'
-
+  platform_version:
+    required: false
+    default: "22.04"
+  toolset:
+    required: false
 
 runs:
   using: composite
   steps:
     - name: Install boost
-      uses: MarkusJx/install-boost@v2.4.4
+      uses: ./.github/actions/install-boost
       id: install-boost
       with:
-        boost_version: 1.81.0
-        platform_version: 22.04
-        boost_install_dir: /home/runner/boost
+        platform_version: ${{ inputs.platform_version }}
+        toolset: ${{ inputs.toolset }}
+
     - name: Build Library
       shell: bash
       run: ./scripts/build.sh ${{ inputs.cmake_target }} ON

.github/actions/install-boost/action.yml

@@ -0,0 +1,63 @@
+# This custom action is used because the MarkusJx/install-boost does
+# not include all built libraries for mac or windows builds.
+# Specifically, it was missing boost_json.
+name: Install Boost
+description: 'Install boost.'
+inputs:
+  platform_version:
+    required: false
+    default: "22.04"
+  toolset:
+    required: false
+
+outputs:
+  BOOST_ROOT:
+    description: The location of the installed boost.
+    value: ${{ steps.determine-root.outputs.BOOST_ROOT }}
+runs:
+  using: composite
+  steps:
+    - name: Install boost using action
+      if: runner.os == 'Linux'
+      uses: MarkusJx/[email protected]
+      id: boost-action
+      with:
+        boost_version: 1.81.0
+        toolset: ${{ inputs.toolset }}
+        platform_version: ${{ inputs.platform_version }}
+
+    - name: Download boost binaries from artifactory
+      if: runner.os == 'Windows'
+      id: boost-download
+      shell: bash
+      run: |
+        choco install boost-msvc-14.3 -y
+        echo "BOOST_ROOT=C:\local\boost_1_81_0" >> $GITHUB_OUTPUT
+
+    - name: Install boost using homebrew
+      id: brew-action
+      if: runner.os == 'macOS'
+      shell: bash
+      run: |
+        brew install [email protected]
+        echo "BOOST_ROOT=$(boost --prefix [email protected])" >> $GITHUB_OUTPUT
+
+    - name: Determine root
+      id: determine-root
+      shell: bash
+      run: |
+        if [ ! -z "$ROOT_ACTION" ]; then
+          echo "BOOST_ROOT=$ROOT_ACTION" >> $GITHUB_OUTPUT
+          echo Setting BOOST_ROOT to "$ROOT_ACTION"
+        elif [ ! -z "$ROOT_DOWN" ]; then
+          echo "BOOST_ROOT=$ROOT_DOWN" >> $GITHUB_OUTPUT
+          echo Setting BOOST_ROOT to "$ROOT_DOWN"
+        else
+          echo "BOOST_ROOT=$ROOT_BREW" >> $GITHUB_OUTPUT
+          echo Setting BOOST_ROOT to "$ROOT_BREW"
+        fi
+
+      env:
+        ROOT_ACTION: ${{ steps.boost-action.outputs.BOOST_ROOT }}
+        ROOT_BREW: ${{ steps.brew-action.outputs.BOOST_ROOT }}
+        ROOT_DOWN: ${{ steps.boost-download.outputs.BOOST_ROOT }}

.github/workflows/client.yml

@@ -18,3 +18,30 @@ jobs:
       - uses: ./.github/actions/ci
         with:
           cmake_target: launchdarkly-cpp-client
+  build-test-mac:
+    runs-on: macos-12
+    steps:
+      - run: |
+          echo "OPENSSL_ROOT_DIR=$(brew --prefix [email protected])" >> "$GITHUB_ENV"
+          # For debugging
+          echo "OPENSSL_ROOT_DIR=$(brew --prefix [email protected])"
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/ci
+        env:
+          OPENSSL_ROOT_DIR: ${{ env.OPENSSL_ROOT_DIR }}
+        with:
+          cmake_target: launchdarkly-cpp-client
+          platform_version: 12
+  build-test-windows:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/ci
+        env:
+          OPENSSL_ROOT_DIR: ${{ env.OPENSSL_ROOT_DIR }}
+          BOOST_LIBRARY_DIR: 'C:\local\boost_1_81_0\lib64-msvc-14.3'
+          BOOST_LIBRARYDIR: 'C:\local\boost_1_81_0\lib64-msvc-14.3'
+        with:
+          cmake_target: launchdarkly-cpp-client
+          platform_version: 2022
+          toolset: msvc

CMakeLists.txt

@@ -26,7 +26,7 @@ if (BUILD_TESTING)
     if (TESTING_SANITIZERS)
         if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak")
-        elseif (CMAKE_CXX_COMPILER_ID STREQUAL " GNU")
+        elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize=leak")
         endif ()
     endif ()

libs/client-sdk/src/data_sources/base_64.cpp

@@ -1,5 +1,6 @@
 #include "launchdarkly/client_side/data_sources/detail/base_64.hpp"
 
+#include <algorithm>
 #include <array>
 #include <bitset>
 #include <climits>
@@ -58,8 +59,11 @@ std::string Base64UrlEncode(std::string const& input) {
 
     while (bit_index < bit_count) {
         // Get either 6 bits, or the remaining number of bits.
-        auto bits = GetBits(bit_index,
-                            std::min(kIndexBits, bit_count - bit_index), input);
+        auto bits =
+            GetBits(bit_index,
+                    std::min(kIndexBits,
+                             static_cast<unsigned long>(bit_count - bit_index)),
+                    input);
         out.push_back(static_cast<char>(kBase64Table.at(bits.to_ulong())));
         bit_index += kIndexBits;
     }

libs/client-sdk/tests/CMakeLists.txt

@@ -7,6 +7,10 @@ file(GLOB tests "${PROJECT_SOURCE_DIR}/tests/*.cpp")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
+# Get things in the same directory on windows.
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}../")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}../")
+
 add_executable(gtest_${LIBNAME}
         ${tests})
 target_link_libraries(gtest_${LIBNAME} launchdarkly::client GTest::gtest_main)

libs/common/CMakeLists.txt

@@ -29,7 +29,7 @@ set(OPENSSL_ROOT_DIR "/opt/homebrew/opt/[email protected]")
 find_package(OpenSSL REQUIRED)
 message(STATUS "LaunchDarkly: using OpenSSL v${OPENSSL_VERSION}")
 
-set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_STATIC_LIBS ON)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
 find_package(Boost 1.80 REQUIRED COMPONENTS json url)

libs/common/include/network/detail/http_requester.hpp

@@ -11,6 +11,11 @@
 
 #include "config/detail/built/http_properties.hpp"
 
+#ifdef _MSC_VER
+// MSVC doesn't support strcasecmp.
+#define strcasecmp _stricmp
+#endif
+
 namespace launchdarkly::network::detail {
 
 struct CaseInsensitiveComparator {
@@ -150,3 +155,7 @@ std::optional<std::string> AppendUrl(std::optional<std::string> url_in,
                                      std::string const& to_append);
 
 }  // namespace launchdarkly::network::detail
+
+#ifdef _MSC_VER
+#undef strcasecmp _stricmp
+#endif

libs/common/src/CMakeLists.txt

@@ -60,7 +60,7 @@ add_library(launchdarkly::common ALIAS ${LIBNAME})
 
 target_link_libraries(${LIBNAME}
         PUBLIC Boost::headers tl::expected OpenSSL::SSL foxy
-        PRIVATE Boost::url Boost::json)
+        PRIVATE Boost::url Boost::json Boost::disable_autolinking)
 
 # Need the public headers to build.
 target_include_directories(${LIBNAME} PUBLIC ../include)

libs/common/tests/CMakeLists.txt

@@ -8,6 +8,10 @@ file(GLOB tests "${PROJECT_SOURCE_DIR}/tests/*.cpp")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
+# Get things in the same directory on windows.
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}../")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}../")
+
 add_executable(gtest_${LIBNAME}
         ${tests})
 target_link_libraries(gtest_${LIBNAME} launchdarkly::common GTest::gtest_main)

libs/common/tests/application_tags_test.cpp

@@ -1,7 +1,10 @@
 
 #include <gtest/gtest.h>
+
 #include <ostream>
 #include <tuple>
+#include <algorithm>
+
 #include "config/detail/builders/app_info_builder.hpp"
 #include "error.hpp"
 #include "null_logger.hpp"

libs/server-sent-events/CMakeLists.txt

@@ -27,8 +27,7 @@ endif ()
 # Needed to fetch external dependencies.
 include(FetchContent)
 
-
-set(OPENSSL_USE_STATIC_LIBS OFF)
+set(OPENSSL_USE_STATIC_LIBS ON)
 find_package(OpenSSL REQUIRED)
 message(STATUS "LaunchDarkly: using OpenSSL v${OPENSSL_VERSION}")
 

libs/server-sent-events/src/CMakeLists.txt

@@ -11,7 +11,8 @@ add_library(${LIBNAME}
         backoff.cpp)
 target_link_libraries(${LIBNAME}
         PUBLIC OpenSSL::SSL Boost::headers
-        PRIVATE Boost::url foxy)
+        PRIVATE Boost::url Boost::disable_autolinking foxy
+        )
 
 add_library(launchdarkly::sse ALIAS ${LIBNAME})
 

libs/server-sent-events/tests/CMakeLists.txt

@@ -7,6 +7,10 @@ file(GLOB tests "${PROJECT_SOURCE_DIR}/tests/*.cpp")
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
+# Get things in the same directory on windows.
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}../")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}../")
+
 add_executable(gtest_${LIBNAME}
         ${tests})
 target_link_libraries(gtest_${LIBNAME} launchdarkly::sse GTest::gtest_main)