Skip to content

Commit

Permalink
Merge 'main' into 'dev/1.0.0' (#118)
Browse files Browse the repository at this point in the history
* fix: cargo-deb install from +stable and --locked (#83)

* build: Sync  with eclipse-zenoh/zenoh@25f06bd from 2024-05-21 (#84)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* build: Sync  with eclipse-zenoh/zenoh@3118d31 from 2024-05-28 (#85)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* build: Sync  with eclipse-zenoh/zenoh@009f666 from 2024-05-30 (#86)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* build: Sync  with eclipse-zenoh/zenoh@d574654 from 2024-06-03 (#87)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* chore: Update artifacts action to v4 (#88)

artifacts actions v3 are deprecated

* build: Sync  with eclipse-zenoh/zenoh@c279982 from 2024-06-05 (#89)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* build: Sync  with eclipse-zenoh/zenoh@d8e66de from 2024-06-10 (#90)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* build: Sync  with eclipse-zenoh/zenoh@9d09742 from 2024-06-11 (#91)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* build: Sync  with eclipse-zenoh/zenoh@ed6c636 from 2024-06-12 (#92)

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* Enable releasing from any branch (#95)

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

* Update main release workflow (#106)

* Update gradle action (#103)

* Update gradle action to use setup-gradle

* chore: update setup-java action to v4

* chore: update gradle/wrapper-validation-action@v3

* Align CI with zenoh-kotlin

Brings the same changes done for zenoh-kotlin in
eclipse-zenoh/zenoh-kotlin#133 to zenoh-java CI

* update README

* review comments

* Update deprecated actions (#109)

* chore: update deprecated actions

* chore: remove unnecessary buildDir()

* fix: add option to build docs for android

* Fix publication error on CI (#111)

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

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

Co-authored-by: eclipse-zenoh-bot <[email protected]>

---------

Co-authored-by: Diogo Matsubara <[email protected]>
Co-authored-by: eclipse-zenoh-bot <[email protected]>
Co-authored-by: eclipse-zenoh-bot <[email protected]>
Co-authored-by: Mahmoud Mazouz <[email protected]>
  • Loading branch information
5 people authored Aug 5, 2024
1 parent 2f98132 commit 09260f3
Show file tree
Hide file tree
Showing 3 changed files with 638 additions and 714 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-dokka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
link-to-sdk: true

- name: Build doc
run: gradle -Pandroid dokkaHtml
run: gradle -Pandroid=true dokkaHtml

- name: Deploy doc
if: ${{ inputs.live-run || false }}
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ on:
type: string
description: Release number of Zenoh
required: false
branch:
type: string
description: Release branch
required: false

jobs:
tag:
Expand All @@ -45,6 +49,7 @@ jobs:
repo: ${{ github.repository }}
live-run: ${{ inputs.live-run || false }}
version: ${{ inputs.version }}
branch: ${{ inputs.branch }}
github-token: ${{ secrets.BOT_TOKEN_WORKFLOW }}

- name: Checkout this repository
Expand Down
Loading

0 comments on commit 09260f3

Please sign in to comment.