chore: merge main into branch

Signed-off-by: gabrik <[email protected]>
eclipse-zenoh · Apr 12, 2024 · b7b2b06 · b7b2b06
2 parents a16d5f3 + a69f908
commit b7b2b06
Show file tree

Hide file tree

Showing 4 changed files with 1,298 additions and 566 deletions.
diff --git a/.github/workflows/enforce-linking-issues.yml b/.github/workflows/enforce-linking-issues.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,27 +20,28 @@ on:
     inputs:
       live-run:
         type: boolean
-        description: If false (or undefined) the workflow runs in dry-run mode (i.e. with no side-effects)
+        description: Live-run
         required: false
       version:
         type: string
-        description: Release number. If undefined, the workflow auto-generates a version using git-describe
+        description: Release number
         required: false
       zenoh-version:
         type: string
-        description: Release number of Zenoh. Required in live-run mode and ignored in dry-run mode
+        description: Release number of Zenoh
         required: false
 
 jobs:
   tag:
-    name: Bump and tag crates
-    uses: eclipse-zenoh/ci/.github/workflows/tag-crates.yml@main
+    name: Branch, Bump & tag crates
+    uses: eclipse-zenoh/ci/.github/workflows/branch-bump-tag-crates.yml@main
     with:
       repo: ${{ github.repository }}
       live-run: ${{ inputs.live-run || false }}
       version: ${{ inputs.version }}
-      inter-deps-pattern: ${{ inputs.live-run && 'zenoh.*' || '^$' }}
-      inter-deps-version: ${{ inputs.live-run && inputs.zenoh-version || '' }}
+      bump-deps-version: ${{ inputs.zenoh-version }}
+      bump-deps-pattern: ${{ inputs.zenoh-version && 'zenoh.*' || '^$' }}
+      bump-deps-branch: ${{ inputs.zenoh-version && format('release/{0}', inputs.zenoh-version) || '' }}
     secrets: inherit
 
   build-debian:
@@ -67,33 +68,21 @@ jobs:
         ^zenoh_plugin_mqtt\.dll$
     secrets: inherit
 
-  cargo-live-run:
-    if: ${{ inputs.live-run || false }}
-    name: Publish Cargo crates (live-run)
+  cargo:
     needs: tag
+    name: Publish Cargo crates
     uses: eclipse-zenoh/ci/.github/workflows/release-crates-cargo.yml@main
     with:
-      repos: ${{ github.repository }}
-      live-run: true
-      branch: ${{ needs.tag.outputs.branch }}
-      inter-deps-pattern: ^$
-    secrets: inherit
-
-  # In dry-run mode, we need to publish eclipse-zenoh/zenoh before this repository,
-  # in which case the version of zenoh dependecies are left as is and thus point to
-  # the main branch of eclipse-zenoh/zenoh
-  cargo-dry-run:
-    if: ${{ !inputs.live-run || true }}
-    name: Publish Cargo crates (dry-run)
-    needs: tag
-    uses: eclipse-zenoh/ci/.github/workflows/release-crates-cargo.yml@main
-    with:
-      repos: |
-        eclipse-zenoh/zenoh
-        ${{ github.repository }}
-      live-run: false
+      repo: ${{ github.repository }}
+      live-run: ${{ inputs.live-run || false }}
       branch: ${{ needs.tag.outputs.branch }}
-      inter-deps-pattern: zenoh.*
+      # - In dry-run mode, we need to publish eclipse-zenoh/zenoh before this
+      #   repository, in which case the version of zenoh dependecies are left as
+      #   is and thus point to the main branch of eclipse-zenoh/zenoh.
+      # - In live-run mode, we assume that eclipse-zenoh/zenoh is already
+      #   published as this workflow can't be responsible for publishing it
+      unpublished-deps-patterns: ${{ !(inputs.live-run || false) && 'zenoh.*' || '' }}
+      unpublished-deps-repos: ${{ !(inputs.live-run || false) && 'eclipse-zenoh/zenoh' || '' }}
     secrets: inherit
 
   debian:
@@ -106,6 +95,7 @@ jobs:
       version: ${{ needs.tag.outputs.version }}
       repo: ${{ github.repository }}
       branch: ${{ needs.tag.outputs.branch }}
+      installation-test: false
     secrets: inherit
 
   homebrew:
@@ -165,17 +155,19 @@ jobs:
     uses: eclipse-zenoh/ci/.github/workflows/release-crates-dockerhub.yml@main
     with:
       no-build: true
-      live-run: ${{ inputs.live-run || false }}
+      live-run: true
       version: ${{ needs.tag.outputs.version }}
       repo: ${{ github.repository }}
-      tags: "eclipse/zenoh-plugin-mqtt:${{ needs.tag.outputs.version }}"
+      branch: ${{ needs.tag.outputs.branch }}
+      tags: "eclipse/zenoh-bridge-mqtt:${{ needs.tag.outputs.version }}"
       binary: zenoh-bridge-mqtt
       files: |
         zenoh-bridge-mqtt
         libzenoh_plugin_mqtt.so
       platforms: |
         linux/arm64
         linux/amd64
+      licenses: EPL-2.0 OR Apache-2.0
     secrets: inherit
 
   ghcr:
@@ -184,15 +176,17 @@ jobs:
     uses: eclipse-zenoh/ci/.github/workflows/release-crates-ghcr.yml@main
     with:
       no-build: true
-      live-run: ${{ inputs.live-run || false }}
+      live-run: true
       version: ${{ needs.tag.outputs.version }}
       repo: ${{ github.repository }}
-      tags: "${{ github.repository }}:${{ needs.tag.outputs.version }}"
+      branch: ${{ needs.tag.outputs.branch }}
+      tags: "ghcr.io/${{ github.repository }}:${{ needs.tag.outputs.version }}"
       binary: zenoh-bridge-mqtt
       files: |
         zenoh-bridge-mqtt
         libzenoh_plugin_mqtt.so
       platforms: |
         linux/arm64
         linux/amd64
+      licenses: EPL-2.0 OR Apache-2.0
     secrets: inherit