From 9a852c105a3571a8aecc5e2f931e866d423f2ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Poderoso?= <120394830+JesusPoderoso@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:30:11 +0200 Subject: [PATCH] Branch out 3.2.x (#939) * Refs #21882: Bump version to 3.2.x Signed-off-by: eProsima * Refs #21882: Update mirror workflow Signed-off-by: eProsima * Refs #21882: Include previous version in PR template backports list Signed-off-by: eProsima * Refs #21882: Add nightly workflows of 3.1.x version Signed-off-by: eProsima --------- Signed-off-by: eProsima --- .github/pull_request_template.md | 2 +- .github/workflows/mirror.yml | 2 +- .github/workflows/nightly-ubuntu-ci.yml | 14 ++++++++++++++ docs/conf.py | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 952ed55d3..9b738b069 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -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. --> - + diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 4e62f78ad..d2cc48a5c 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '3.1.x' + - '3.2.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 8886006b2..88b96dfe7 100644 --- a/.github/workflows/nightly-ubuntu-ci.yml +++ b/.github/workflows/nightly-ubuntu-ci.yml @@ -20,6 +20,20 @@ jobs: run-tests: true use-ccache: false + nightly-ubuntu-ci-3_1_x: + uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@3.1.x + 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/reusable-ubuntu-ci.yml@3.0.x with: diff --git a/docs/conf.py b/docs/conf.py index 019d7288c..5de160512 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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.