Skip to content

[21784] Bump version to 3.1.0 #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
Please uncomment following line, adjusting the corresponding target branches for the backport.
-->
<!-- @Mergifyio backport 2.14.x 2.10.x 2.6.x -->
<!-- @Mergifyio backport 3.0.x 2.14.x 2.10.x 2.6.x -->

<!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
<!-- Fixes #(issue) -->
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: false
matrix:
dest_branch:
- '3.0.x'
- '3.1.x'
- '3.x'
steps:
- name: Mirror action step
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ jobs:
run-build: true
use-ccache: false

nightly-ubuntu-ci-3_0_x:
uses: eProsima/ShapesDemo/.github/workflows/[email protected]
with:
os-version: 'ubuntu-22.04'
label: 'nightly-ubuntu-ci-3.0.x'
shapes-demo-branch: '3.0.x'
fastdds-branch: '3.0.x'
run-build: true
use-ccache: false

nightly-ubuntu-ci-2_14_x:
uses: eProsima/ShapesDemo/.github/workflows/[email protected]
with:
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/nightly-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,21 @@ jobs:
fastdds-branch: 'master'
run-build: true

nightly-windows-ci-3_0_x:
strategy:
fail-fast: false
matrix:
vs-toolset:
- 'v142'
uses: eProsima/ShapesDemo/.github/workflows/[email protected]
with:
os-version: 'windows-2019'
vs-toolset: ${{ matrix.vs-toolset }}
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-3.0.x'
shapes-demo-branch: '3.0.x'
fastdds-branch: '3.0.x'
run-build: true

nightly-windows-ci-2_14_x:
strategy:
fail-fast: false
Expand Down
4 changes: 2 additions & 2 deletions shapes-demo-ros2.repos
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ repositories:
fastdds:
type: git
url: https://github.com/eProsima/Fast-DDS.git
version: 3.0.x
version: 3.1.x
shapes-demo-typesupport:
type: git
url: https://github.com/eProsima/ShapesDemo-TypeSupport.git
version: v1.0.0
shapes-demo:
type: git
url: https://github.com/eProsima/ShapesDemo.git
version: 3.0.x
version: 3.1.x
4 changes: 2 additions & 2 deletions shapes-demo.repos
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ repositories:
fastdds:
type: git
url: https://github.com/eProsima/Fast-DDS.git
version: 3.0.x
version: 3.1.x
shapes-demo:
type: git
url: https://github.com/eProsima/ShapesDemo.git
version: 3.0.x
version: 3.1.x
2 changes: 1 addition & 1 deletion version.pri
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SHAPESVERSION="3.0.1"
SHAPESVERSION="3.1.0"
Loading