Skip to content

Commit

Permalink
Branch out 3.2.x (#939)
Browse files Browse the repository at this point in the history
* Refs #21882: Bump version to 3.2.x

Signed-off-by: eProsima <[email protected]>

* Refs #21882: Update mirror workflow

Signed-off-by: eProsima <[email protected]>

* Refs #21882: Include previous version in PR template backports list

Signed-off-by: eProsima <[email protected]>

* Refs #21882: Add nightly workflows of 3.1.x version

Signed-off-by: eProsima <[email protected]>

---------

Signed-off-by: eProsima <[email protected]>
  • Loading branch information
JesusPoderoso authored Oct 17, 2024
1 parent d60571d commit 9a852c1
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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 3.0.x 2.14.x 2.10.x 2.6.x -->
<!-- @Mergifyio backport 3.1.x 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.1.x'
- '3.2.x'
- '3.x'
steps:
- name: Mirror action step
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@ jobs:
run-tests: true
use-ccache: false

nightly-ubuntu-ci-3_1_x:
uses: eProsima/Fast-DDS-docs/.github/workflows/[email protected]
with:
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
os-version: 'ubuntu-24.04'
label: 'nightly-ubuntu-ci-3.1.x'
fastdds-docs-branch: '3.1.x'
fastdds-branch: '3.1.x'
fastdds-python-branch: '2.1.x'
run-build: true
run-tests: true
use-ccache: false

nightly-ubuntu-ci-3_0_x:
uses: eProsima/Fast-DDS-docs/.github/workflows/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,9 @@ def configure_doxyfile(
# built documents.
#
# The short X.Y version.
version = u'3.1.0'
version = u'3.2.0'
# The full version, including alpha/beta/rc tags.
release = u'3.1.0'
release = u'3.2.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit 9a852c1

Please sign in to comment.