Merge pull request #177 from DenisBiryukov91/dev/merge_main

merge main
eclipse-zenoh · Aug 6, 2024 · 27c7d18 · 27c7d18
2 parents 648761b + 5722d8c
commit 27c7d18
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,6 +7,7 @@ on:
     branches: ["**"]
   schedule:
     - cron: "0 6 * * 1-5"
+  workflow_dispatch:
 
 jobs:
   build:
@@ -51,7 +52,7 @@ jobs:
           ctest --output-on-failure
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           # Artifact name
           name: zenoh-cpp-${{ matrix.os }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,6 +34,10 @@ on:
         type: string
         description: Release number of zenoh-pico
         required: false
+      branch:
+        type: string
+        description: Release branch
+        required: false
 
 jobs:
   tag:
@@ -53,6 +57,7 @@ jobs:
           # However, we still need some placeholder version to test that the
           # version can be reliably bumped.
           version: ${{ inputs.version || '0.0.0' }}
+          branch: ${{ inputs.branch }}
           github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }}
 
       - name: Clone this repository

diff --git a/install/PackageConfig.cmake.in b/install/PackageConfig.cmake.in
@@ -24,7 +24,7 @@ if(_IMPORT_PREFIX STREQUAL "/")
 endif()
 
 set(_ZENOHCXX_BACKEND_FOUND FALSE)
-add_library(zenohcxx INTERFACE)
+add_library(zenohcxx INTERFACE IMPORTED)
 target_include_directories(zenohcxx INTERFACE "${_IMPORT_PREFIX}/@CMAKE_INSTALL_INCLUDEDIR@")
 
 # zenohcxx for zenohpico