Skip to content

Commit

Permalink
Merge main -> dev/1.0.0, (#131)
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 10bcfd2
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Tue Jul 30 02:15:00 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@2d88c7b from 2024-07-29 (#127)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 3be5e03
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Sat Jul 27 02:15:42 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@e587aa9 from 2024-07-26 (#126)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 3855b46
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Sat Jul 27 02:14:45 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@e587aa9 from 2024-07-26 (#125)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 3bca958
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Fri Jul 26 02:15:50 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@0a969cb from 2024-07-25 (#122)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit f1c2e01
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Tue Jul 9 02:15:30 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@b3e42ce from 2024-07-08 (#116)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit a5aaf97
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Thu Jul 4 02:15:45 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@b93ca84 from 2024-07-03 (#110)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit d8e462f
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Thu Jul 4 02:15:09 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@b93ca84 from 2024-07-03 (#109)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 843a4cd
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Wed Jul 3 02:15:56 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@869ace6 from 2024-07-02 (#108)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 0b04034
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Wed Jul 3 02:15:16 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@869ace6 from 2024-07-02 (#107)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 94ed441
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Fri Jun 21 02:16:03 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@2500e5a from 2024-06-20 (#99)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit f5145d3
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Tue Jun 18 02:15:29 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@93f93d2 from 2024-06-17 (#98)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 1ed6d9f
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Sat Jun 15 02:15:07 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@7adad94 from 2024-06-14 (#96)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>

commit 2ac485f
Author: Mahmoud Mazouz <mazouz.mahmoud@outlook.com>
Date:   Fri Jun 14 08:55:58 2024 +0200

    Enable releasing from any branch (#92)

commit cf7c58b
Author: eclipse-zenoh-bot <61247838+eclipse-zenoh-bot@users.noreply.github.com>
Date:   Fri Jun 14 02:14:47 2024 +0200

    build: Sync  with eclipse-zenoh/zenoh@8160b01 from 2024-06-13 (#93)

    Co-authored-by: eclipse-zenoh-bot <eclipse-zenoh-bot@users.noreply.github.com>
  • Loading branch information
Charles-Schleich authored Aug 2, 2024
1 parent b9a036b commit bd8b682
Show file tree
Hide file tree
Showing 2 changed files with 708 additions and 759 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ on:
type: string
description: Zenoh Release number
required: false
branch:
type: string
description: Release branch
required: false

jobs:
tag:
Expand All @@ -40,6 +44,7 @@ jobs:
repo: ${{ github.repository }}
live-run: ${{ inputs.live-run || false }}
version: ${{ inputs.version }}
branch: ${{ inputs.branch }}
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) || '' }}
Expand Down
Loading

0 comments on commit bd8b682

Please sign in to comment.