Merge branch 'main' into rlamb/remove-vendored-allocate_unique

launchdarkly · Dec 19, 2024 · 0b1cefa · 0b1cefa
2 parents a4e5d16 + b978ea4
commit 0b1cefa
Show file tree

Hide file tree

Showing 153 changed files with 2,629 additions and 394 deletions.
diff --git a/.github/actions/cmake-test/action.yml b/.github/actions/cmake-test/action.yml
@@ -0,0 +1,51 @@
+# This is a composite to allow sharing these steps into other workflows.
+# It isn't a shared workflow, because then it isn't convenient to add
+# additional package-specific steps.
+name: CMake Integration Test
+description: 'CMake integration test suitable for running on multiple platforms.'
+inputs:
+  platform_version:
+    description: 'Boost platform version'
+    required: false
+    default: "22.04"
+  toolset:
+    description: 'Boost toolset'
+    required: false
+
+runs:
+  using: composite
+  steps:
+    - name: Install Ninja
+      uses: ./.github/actions/install-ninja
+    - name: Install boost
+      uses: ./.github/actions/install-boost
+      id: install-boost
+      with:
+        platform_version: ${{ inputs.platform_version }}
+        toolset: ${{ inputs.toolset }}
+    - name: Install OpenSSL
+      uses: ./.github/actions/install-openssl
+      id: install-openssl
+    - name: Configure CMake Integration Tests
+      shell: bash
+      run: ./scripts/configure-cmake-integration-tests.sh
+      env:
+        # These will be injected into the SDK CMake project on the command line, via "-D BOOST_ROOT=..."
+        # and   "-D OPENSSL_ROOT_DIR=...". When the integration tests are configured, they will then be passed
+        # along in the same manner to those test projects via the command line.
+        BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
+        OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
+        CMAKE_INSTALL_PREFIX: ../LAUNCHDARKLY_INSTALL
+    - name: Build the SDK
+      shell: bash
+      run: |
+        cmake --build build
+    - name: Install the SDK
+      shell: bash
+      run: |
+        cmake --install build
+    - name: Run CMake Integration Tests
+      shell: bash
+      run: |
+        export CTEST_OUTPUT_ON_FAILURE=1
+        cd build/cmake-tests && ctest
diff --git a/.github/actions/install-openssl/action.yml b/.github/actions/install-openssl/action.yml
@@ -32,7 +32,7 @@ runs:
       if: runner.os == 'Windows'
       shell: bash
       run: |
-        choco install openssl --version 3.1.1 -y --no-progress
+        choco install openssl --version 3.4.0 -y --no-progress
         if [ -d "C:\Program Files\OpenSSL-Win64" ]; then
           echo "OPENSSL_ROOT_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_OUTPUT
         else

diff --git a/.github/actions/publish-docs/action.yml b/.github/actions/publish-docs/action.yml
@@ -11,7 +11,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: launchdarkly/gh-actions/actions/publish-pages@publish-pages-v1.0.1
+    - uses: launchdarkly/gh-actions/actions/publish-pages@publish-pages-v1.0.2
       name: 'Publish to Github pages'
       with:
         docs_path: ${{ inputs.workspace_path }}/docs

diff --git a/.github/actions/sdk-release/action.yml b/.github/actions/sdk-release/action.yml
@@ -90,6 +90,7 @@ runs:
       uses: ./.github/actions/publish-docs
       with:
         workspace_path: ${{ inputs.sdk_path }}
+        token: ${{ inputs.github_token }}
 
     - name: Configure MSVC
       if: runner.os == 'Windows'

diff --git a/.github/workflows/client.yml b/.github/workflows/client.yml
@@ -29,7 +29,7 @@ jobs:
           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.0.2
+      - 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 }}
@@ -43,7 +43,7 @@ jobs:
           cmake_target: launchdarkly-cpp-client
           simulate_release: true
   build-test-client-mac:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ci

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -0,0 +1,43 @@
+name: cmake-integration
+
+on:
+  push:
+    branches: [ main ]
+    paths-ignore:
+      - '**.md' # Do not need to run CI for markdown changes.
+  pull_request:
+    branches: [ "main", "feat/**" ]
+    paths-ignore:
+      - '**.md'
+  schedule:
+    # Run daily at midnight PST
+    - cron: '0 8 * * *'
+
+jobs:
+  test-ubuntu:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/cmake-test
+        with:
+          platform_version: '22.04'
+
+  test-macos:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./.github/actions/cmake-test
+        with:
+          platform_version: '12'
+
+  test-windows:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ilammy/msvc-dev-cmd@v1
+      - uses: ./.github/actions/cmake-test
+        env:
+          BOOST_ROOT: 'C:\local\boost_1_81_0\lib64-msvc-14.3'
+        with:
+          platform_version: 2022
+          toolset: msvc
diff --git a/.github/workflows/hello-apps.yml b/.github/workflows/hello-apps.yml
@@ -15,7 +15,7 @@ jobs:
   smoketest:
     strategy:
       matrix:
-        os: [ "ubuntu-22.04", "macos-12", "windows-2022" ]
+        os: [ "ubuntu-22.04", "macos-13", "windows-2022" ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
     steps:
@@ -35,11 +35,17 @@ jobs:
         env:
           BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
           OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
-      - name: Dynamically Linked Hello Apps
+      - name: Dynamically Linked Hello Apps (C API only)
         shell: bash
         continue-on-error: true # TODO(SC-223804)
-        # Only the C bindings work with dynamic linking because C++ symbols are hidden
         run: ./scripts/run-hello-apps.sh dynamic hello-c-client hello-c-server
         env:
           BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
           OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
+      - name: Dynamically Linked Hello Apps (C and C++ APIs)
+        shell: bash
+        continue-on-error: true # TODO(SC-223804)
+        run: ./scripts/run-hello-apps.sh dynamic-export-all-symbols hello-c-client hello-cpp-client hello-c-server hello-cpp-server
+        env:
+          BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }}
+          OPENSSL_ROOT_DIR: ${{ steps.install-openssl.outputs.OPENSSL_ROOT_DIR }}
diff --git a/.github/workflows/manual-publish-doc.yml b/.github/workflows/manual-publish-doc.yml
@@ -16,11 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          registry-url: 'https://registry.npmjs.org'
-      - run: sudo apt-get install doxygen
+      - run: sudo apt-get install doxygen graphviz
       - id: build
         # Build using the same steps from CI.
         name: Build

diff --git a/.github/workflows/manual-sdk-release-artifacts.yml b/.github/workflows/manual-sdk-release-artifacts.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         # Each of the platforms for which release-artifacts need generated.
-        os: [ ubuntu-latest, windows-2022, macos-12 ]
+        os: [ ubuntu-latest, 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
@@ -24,7 +24,7 @@ jobs:
     strategy:
       matrix:
         # Each of the platforms for which release-artifacts need generated.
-        os: [ ubuntu-latest, windows-2022, macos-12 ]
+        os: [ ubuntu-latest, 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-12 ]
+        os: [ ubuntu-latest, 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-12 ]
+        os: [ ubuntu-latest, windows-2022, macos-13 ]
     runs-on: ${{ matrix.os }}
     needs: [ 'release-please' ]
     if: ${{ needs.release-please.outputs.package-server-redis-released  == 'true'}}

diff --git a/.github/workflows/server-redis.yml b/.github/workflows/server-redis.yml
@@ -28,7 +28,7 @@ jobs:
           cmake_target: launchdarkly-cpp-server-redis-source
           simulate_release: true
   build-redis-mac:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ci

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -28,7 +28,7 @@ jobs:
           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.0.2
+      - 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 }}
@@ -43,7 +43,7 @@ jobs:
           cmake_target: launchdarkly-cpp-server
           simulate_release: true
   build-test-server-mac:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/ci

diff --git a/.github/workflows/sse.yml b/.github/workflows/sse.yml
@@ -32,8 +32,9 @@ jobs:
           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.0.0
+      - 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/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,8 +1,8 @@
 {
-  "libs/client-sdk": "3.6.3",
-  "libs/server-sent-events": "0.5.2",
-  "libs/common": "1.7.0",
-  "libs/internal": "0.8.1",
-  "libs/server-sdk": "3.5.3",
-  "libs/server-sdk-redis-source": "2.1.11"
+  "libs/client-sdk": "3.8.1",
+  "libs/server-sent-events": "0.5.4",
+  "libs/common": "1.9.0",
+  "libs/internal": "0.10.0",
+  "libs/server-sdk": "3.8.0",
+  "libs/server-sdk-redis-source": "2.1.16"
 }