Merge pull request #720 from apache/hotfix/ci-build

Hotfix/ci build
apache · Jan 18, 2024 · 5afee1e · 5afee1e
2 parents a800c42 + 62b42f2
commit 5afee1e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Install conan and lcov
         run: |
           sudo apt-get install -yq --no-install-recommends lcov
-          sudo pip install conan==1.59.0
+          sudo pip install conan==1.62.0
       - name: Setup Conan Profile
         run: |
           conan profile new default --detect

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v3.3.0
       - name: Install build dependencies
         run: |
-          sudo pip install -U conan==1.59.0
+          sudo pip install -U conan==1.62.0
           sudo apt-get install -yq --no-install-recommends ninja-build
       - name: Setup Conan Profile
         env:

diff --git a/cmake/CelixDeps.cmake.in b/cmake/CelixDeps.cmake.in
@@ -10,7 +10,6 @@ $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::launcher>>:find_dependency(CURL)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::etcdlib>>:find_dependency(CURL)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::deployment_admin>>:find_dependency(CURL)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::rsa_dfi>>:find_dependency(CURL)>
-$<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::RsaConfiguredDiscovery>>:find_dependency(RapidJSON)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::rsa_discovery>>:find_dependency(LibXml2)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::bonjour_shell>>:find_dependency(LibXml2)>
 $<$<BOOL:$<TARGET_NAME_IF_EXISTS:Celix::celix_pubsub_admin_zmq>>:find_dependency(ZeroMQ)>