diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d4d355b..35da553 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -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. --> - + diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index cb4cfb5..1f6d078 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '3.3.x' + - '3.4.x' - '3.x' steps: - name: Mirror action step diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml index 3b958cd..de04794 100644 --- a/.github/workflows/nightly-ubuntu-ci.yml +++ b/.github/workflows/nightly-ubuntu-ci.yml @@ -16,6 +16,16 @@ jobs: run-build: true use-ccache: false + nightly-ubuntu-ci-3_3_x: + uses: eProsima/ShapesDemo/.github/workflows/reusable-ubuntu-ci.yml@3.3.x + with: + os-version: 'ubuntu-22.04' + label: 'nightly-ubuntu-ci-3.3.x' + shapes-demo-branch: '3.3.x' + fastdds-branch: '3.3.x' + run-build: true + use-ccache: false + nightly-ubuntu-ci-3_2_x: uses: eProsima/ShapesDemo/.github/workflows/reusable-ubuntu-ci.yml@3.2.x with: diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index 010924c..a2bfd85 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -22,6 +22,22 @@ jobs: fastdds-branch: 'master' run-build: true + nightly-windows-ci-3_3_x: + strategy: + fail-fast: false + matrix: + vs-toolset: + - 'v142' + - 'v143' + uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@3.3.x + with: + os-version: 'windows-2022' + vs-toolset: ${{ matrix.vs-toolset }} + label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-3.3.x' + shapes-demo-branch: '3.3.x' + fastdds-branch: '3.3.x' + run-build: true + nightly-windows-ci-3_2_x: strategy: fail-fast: false diff --git a/shapes-demo-ros2.repos b/shapes-demo-ros2.repos index 119e091..f52d4b5 100644 --- a/shapes-demo-ros2.repos +++ b/shapes-demo-ros2.repos @@ -10,7 +10,7 @@ repositories: fastdds: type: git url: https://github.com/eProsima/Fast-DDS.git - version: 3.3.x + version: 3.4.x shapes-demo-typesupport: type: git url: https://github.com/eProsima/ShapesDemo-TypeSupport.git @@ -18,4 +18,4 @@ repositories: shapes-demo: type: git url: https://github.com/eProsima/ShapesDemo.git - version: 3.3.x + version: 3.4.x diff --git a/shapes-demo.repos b/shapes-demo.repos index a2063e3..e09e442 100644 --- a/shapes-demo.repos +++ b/shapes-demo.repos @@ -10,8 +10,8 @@ repositories: fastdds: type: git url: https://github.com/eProsima/Fast-DDS.git - version: 3.3.x + version: 3.4.x shapes-demo: type: git url: https://github.com/eProsima/ShapesDemo.git - version: 3.3.x + version: 3.4.x diff --git a/version.pri b/version.pri index b894256..c436730 100644 --- a/version.pri +++ b/version.pri @@ -1 +1 @@ -SHAPESVERSION="3.3.0" +SHAPESVERSION="3.4.0"