Build tests and contract tests with and without CURL.

kinyoklion · kinyoklion · commit 185d668449f7 · 2025-10-14T12:54:43.000-07:00
diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
@@ -29,6 +29,10 @@ inputs:
     description: 'Whether to run ./build-release-windows.sh for the CMake target'
     required: false
     default: 'false'
+  use_curl:
+    description: 'Whether to enable CURL networking (LD_CURL_NETWORKING=ON)'
+    required: false
+    default: 'false'
 
 runs:
   using: composite
@@ -44,22 +48,30 @@ runs:
     - name: Install OpenSSL
       uses: ./.github/actions/install-openssl
       id: install-openssl
+    - name: Install CURL
+      if: inputs.use_curl == 'true'
+      uses: ./.github/actions/install-curl
+      id: install-curl
     - name: Build Library
       shell: bash
-      run: ./scripts/build.sh ${{ inputs.cmake_target }} ON
+      run: ./scripts/build.sh ${{ inputs.cmake_target }} ON ${{ inputs.use_curl }}
       env:
         BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
         Boost_DIR: ${{ steps.install-boost.outputs.Boost_DIR }}
         OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
+        CURL_ROOT: ${{ steps.install-curl.outputs.CURL_ROOT }}
+        CMAKE_PREFIX_PATH: ${{ steps.install-curl.outputs.CURL_ROOT }}
     - name: Build Tests
       id: build-tests
       if: inputs.run_tests == 'true'
       shell: bash
-      run: ./scripts/build.sh gtest_${{ inputs.cmake_target }} ON
+      run: ./scripts/build.sh gtest_${{ inputs.cmake_target }} ON ${{ inputs.use_curl }}
       env:
         BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
         Boost_DIR: ${{ steps.install-boost.outputs.Boost_DIR }}
         OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
+        CURL_ROOT: ${{ steps.install-curl.outputs.CURL_ROOT }}
+        CMAKE_PREFIX_PATH: ${{ steps.install-curl.outputs.CURL_ROOT }}
     - name: Run Tests
       if: steps.build-tests.outcome == 'success'
       shell: bash
@@ -70,16 +82,30 @@ runs:
     - name: Simulate Release (Linux/MacOS)
       if: inputs.simulate_release == 'true'
       shell: bash
-      run: ./scripts/build-release.sh ${{ inputs.cmake_target }}
+      run: |
+        if [ "${{ inputs.use_curl }}" == "true" ]; then
+          ./scripts/build-release.sh ${{ inputs.cmake_target }} --with-curl
+        else
+          ./scripts/build-release.sh ${{ inputs.cmake_target }}
+        fi
       env:
         BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
         OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
+        CURL_ROOT: ${{ steps.install-curl.outputs.CURL_ROOT }}
+        CMAKE_PREFIX_PATH: ${{ steps.install-curl.outputs.CURL_ROOT }}
 
     - name: Simulate Release (Windows)
       if: inputs.simulate_windows_release == 'true'
       shell: bash
-      run: ./scripts/build-release-windows.sh ${{ inputs.cmake_target }}
+      run: |
+        if [ "${{ inputs.use_curl }}" == "true" ]; then
+          ./scripts/build-release-windows.sh ${{ inputs.cmake_target }} --with-curl
+        else
+          ./scripts/build-release-windows.sh ${{ inputs.cmake_target }}
+        fi
       env:
         BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
         OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
         Boost_DIR: 'C:\local\boost_1_87_0\lib64-msvc-14.3\cmake\Boost-1.87.0'
+        CURL_ROOT: ${{ steps.install-curl.outputs.CURL_ROOT }}
+        CMAKE_PREFIX_PATH: ${{ steps.install-curl.outputs.CURL_ROOT }}
diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
@@ -15,7 +15,26 @@ on:
 
 jobs:
   contract-tests:
+    runs-on: ubuntu-22.04
+    env:
+      # Port the test service (implemented in this repo) should bind to.
+      TEST_SERVICE_PORT: 8123
+      TEST_SERVICE_BINARY: ./build/contract-tests/client-contract-tests/client-tests
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: client-tests
+          run_tests: false
+      - name: 'Launch test service as background task'
+        run: $TEST_SERVICE_BINARY $TEST_SERVICE_PORT 2>&1 &
+      - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.1.0
+        with:
+          # Inform the test harness of test service's port.
+          test_service_port: ${{ env.TEST_SERVICE_PORT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
 
+  contract-tests-curl:
     runs-on: ubuntu-22.04
     env:
       # Port the test service (implemented in this repo) should bind to.
@@ -27,6 +46,7 @@ jobs:
         with:
           cmake_target: client-tests
           run_tests: false
+          use_curl: true
       - name: 'Launch test service as background task'
         run: $TEST_SERVICE_BINARY $TEST_SERVICE_PORT 2>&1 &
       - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.1.0
@@ -42,6 +62,17 @@ jobs:
         with:
           cmake_target: launchdarkly-cpp-client
           simulate_release: true
+
+  build-test-curl:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: launchdarkly-cpp-client
+          use_curl: true
+          simulate_release: true
+
   build-test-client-mac:
     runs-on: macos-13
     steps:
@@ -51,6 +82,18 @@ jobs:
           cmake_target: launchdarkly-cpp-client
           platform_version: 12
           simulate_release: true
+
+  build-test-client-mac-curl:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: launchdarkly-cpp-client
+          platform_version: 12
+          use_curl: true
+          simulate_release: true
+
   build-test-client-windows:
     runs-on: windows-2022
     steps:
@@ -66,3 +109,20 @@ jobs:
           platform_version: 2022
           toolset: msvc
           simulate_windows_release: true
+
+  build-test-client-windows-curl:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: ./.github/actions/ci
+        env:
+          BOOST_LIBRARY_DIR: 'C:\local\boost_1_87_0\lib64-msvc-14.3'
+          BOOST_LIBRARYDIR: 'C:\local\boost_1_87_0\lib64-msvc-14.3'
+          Boost_DIR: 'C:\local\boost_1_87_0\lib64-msvc-14.3\cmake\Boost-1.87.0'
+        with:
+          cmake_target: launchdarkly-cpp-client
+          platform_version: 2022
+          toolset: msvc
+          use_curl: true
+          simulate_windows_release: true
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -34,6 +34,29 @@ jobs:
           test_service_port: ${{ env.TEST_SERVICE_PORT }}
           extra_params: '-skip-from ./contract-tests/server-contract-tests/test-suppressions.txt'
           token: ${{ secrets.GITHUB_TOKEN }}
+
+  contract-tests-curl:
+    runs-on: ubuntu-22.04
+    env:
+      # Port the test service (implemented in this repo) should bind to.
+      TEST_SERVICE_PORT: 8123
+      TEST_SERVICE_BINARY: ./build/contract-tests/server-contract-tests/server-tests
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: server-tests
+          run_tests: false
+          use_curl: true
+      - name: 'Launch test service as background task'
+        run: $TEST_SERVICE_BINARY $TEST_SERVICE_PORT 2>&1 &
+      - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.1.0
+        with:
+          # Inform the test harness of test service's port.
+          test_service_port: ${{ env.TEST_SERVICE_PORT }}
+          extra_params: '-skip-from ./contract-tests/server-contract-tests/test-suppressions.txt'
+          token: ${{ secrets.GITHUB_TOKEN }}
+
   build-test-server:
     runs-on: ubuntu-22.04
     steps:
@@ -42,6 +65,17 @@ jobs:
         with:
           cmake_target: launchdarkly-cpp-server
           simulate_release: true
+
+  build-test-server-curl:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: launchdarkly-cpp-server
+          use_curl: true
+          simulate_release: true
+
   build-test-server-mac:
     runs-on: macos-13
     steps:
@@ -51,6 +85,18 @@ jobs:
           cmake_target: launchdarkly-cpp-server
           platform_version: 12
           simulate_release: true
+
+  build-test-server-mac-curl:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: launchdarkly-cpp-server
+          platform_version: 12
+          use_curl: true
+          simulate_release: true
+
   build-test-server-windows:
     runs-on: windows-2022
     steps:
@@ -62,3 +108,16 @@ jobs:
           platform_version: 2022
           toolset: msvc
           simulate_windows_release: true
+
+  build-test-server-windows-curl:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: launchdarkly-cpp-server
+          platform_version: 2022
+          toolset: msvc
+          use_curl: true
+          simulate_windows_release: true
diff --git a/.github/workflows/sse.yml b/.github/workflows/sse.yml
@@ -18,6 +18,16 @@ jobs:
       - uses: ./.github/actions/ci
         with:
           cmake_target: launchdarkly-sse-client
+
+  build-test-sse-curl:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: launchdarkly-sse-client
+          use_curl: true
+
   contract-tests:
     runs-on: ubuntu-22.04
     env:
@@ -38,3 +48,25 @@ jobs:
           branch: 'main'
           test_service_port: ${{ env.TEST_SERVICE_PORT }}
           token: ${{ secrets.GITHUB_TOKEN }}
+
+  contract-tests-curl:
+    runs-on: ubuntu-22.04
+    env:
+      # Port the test service (implemented in this repo) should bind to.
+      TEST_SERVICE_PORT: 8123
+      TEST_SERVICE_BINARY: ./build/contract-tests/sse-contract-tests/sse-tests
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/ci
+        with:
+          cmake_target: sse-tests
+          run_tests: false
+          use_curl: true
+      - name: 'Launch test service as background task'
+        run: $TEST_SERVICE_BINARY $TEST_SERVICE_PORT 2>&1 &
+      - uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1.1.0
+        with:
+          repo: 'sse-contract-tests'
+          branch: 'main'
+          test_service_port: ${{ env.TEST_SERVICE_PORT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -2,10 +2,11 @@
 
 # This script builds a specific cmake target.
 # This script should be ran from the root directory of the project.
-# ./scripts/build.sh my-build-target ON
+# ./scripts/build.sh my-build-target ON [true|false]
 #
 # $1 the name of the target. For example "launchdarkly-cpp-common".
 # $2 ON/OFF which enables/disables building in a test configuration (unit tests + contract tests.)
+# $3 (optional) true/false to enable/disable CURL networking (LD_CURL_NETWORKING)
 
 function cleanup {
   cd ..
@@ -24,12 +25,17 @@ if [ "$1" == "launchdarkly-cpp-server-redis-source" ] || [ "$1" == "gtest_launch
   build_redis="ON"
 fi
 
-
+# Check for CURL networking option
+build_curl="OFF"
+if [ "$3" == "true" ]; then
+  build_curl="ON"
+fi
 
 cmake -G Ninja -D CMAKE_COMPILE_WARNING_AS_ERROR=TRUE \
                -D BUILD_TESTING="$2" \
                -D LD_BUILD_UNIT_TESTS="$2" \
                -D LD_BUILD_CONTRACT_TESTS="$2" \
-               -D LD_BUILD_REDIS_SUPPORT="$build_redis" ..
+               -D LD_BUILD_REDIS_SUPPORT="$build_redis" \
+               -D LD_CURL_NETWORKING="$build_curl" ..
 
 cmake --build . --target "$1"
