From 893e0b12d82b3a3fec8fb6d8b32bc1205dee4f55 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 2 Oct 2024 10:42:52 +0200 Subject: [PATCH 1/4] Refs #21784. Bump version to 3.1.0 Signed-off-by: Miguel Company --- docs/conf.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index e4575eb06..019d7288c 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.0.1' +version = u'3.1.0' # The full version, including alpha/beta/rc tags. -release = u'3.0.1' +release = u'3.1.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. From 049959cedbae6109f6c5b24e99816b466022d945 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 2 Oct 2024 10:44:10 +0200 Subject: [PATCH 2/4] Refs #21784. Update mirror workflow. Signed-off-by: Miguel Company --- .github/workflows/mirror.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index db69de3f5..4e62f78ad 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '3.0.x' + - '3.1.x' - '3.x' steps: - name: Mirror action step From 047397df623f00826064e216cb13e4d54d6a5396 Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 2 Oct 2024 11:16:04 +0200 Subject: [PATCH 3/4] Refs #21784. Update PR template. Signed-off-by: Miguel Company --- .github/pull_request_template.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index a5b65ab38..952ed55d3 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. --> - + From 34f2db784d5b984bb75d5f9b23d9339f534e251b Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Wed, 2 Oct 2024 11:26:18 +0200 Subject: [PATCH 4/4] Refs #21784. Update nightly job. Signed-off-by: Miguel Company --- .github/workflows/nightly-ubuntu-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml index 21572e35e..8886006b2 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_0_x: + uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@3.0.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.0.x' + fastdds-docs-branch: '3.0.x' + fastdds-branch: '3.0.x' + fastdds-python-branch: '2.0.x' + run-build: true + run-tests: true + use-ccache: false + nightly-ubuntu-ci-2_14_x: uses: eProsima/Fast-DDS-docs/.github/workflows/reusable-ubuntu-ci.yml@2.14.x with: