Skip to content

Commit b3e70c8

Browse files
Branch out 4.2.x (#510)
* Refs #23520. Update mirror workflow. Signed-off-by: Miguel Company <[email protected]> * Refs #23520. Bump version to 4.2.0. Signed-off-by: Miguel Company <[email protected]> * Refs #23520. Update IDL parser to 4.2. Signed-off-by: Miguel Company <[email protected]> * Refs #23520. Update PR template. Signed-off-by: Miguel Company <[email protected]> * Refs #23520. Update nightly jobs. Signed-off-by: Miguel Company <[email protected]> * Refs #23520. Restore 4.0.x as supported branch (Fast DDS 3.2.x) Signed-off-by: Miguel Company <[email protected]> --------- Signed-off-by: Miguel Company <[email protected]>
1 parent 55dd5b8 commit b3e70c8

File tree

5 files changed

+28
-7
lines changed

5 files changed

+28
-7
lines changed

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
1818
Please uncomment following line, adjusting the corresponding target branches for the backport.
1919
-->
20-
<!-- @Mergifyio backport 3.3.x 2.1.x -->
20+
<!-- @Mergifyio backport 4.1.x 4.0.x 3.3.x 2.1.x -->
2121

2222
<!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
2323
<!-- Fixes #(issue) -->

.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
dest_branch:
16-
- '4.1.x'
16+
- '4.2.x'
1717
- '4.x'
1818
steps:
1919
- name: Mirror action step

.github/workflows/nightly-ubuntu-ci.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run-tests: true
2828
use-ccache: false
2929

30-
nightly-ubuntu-ci-4_1_x:
30+
nightly-ubuntu-ci-4_1_x-fast-3_3_x:
3131
strategy:
3232
fail-fast: false
3333
matrix:
@@ -38,8 +38,29 @@ jobs:
3838
with:
3939
os-version: 'ubuntu-22.04'
4040
java-version: ${{ matrix.java-version }}
41-
label: 'nightly-ubuntu-ci-4.1.x'
41+
label: 'nightly-ubuntu-ci-4.1.x-3.3.x'
4242
fastddsgen-branch: '4.1.x'
43+
fastdds-branch: '3.3.x'
44+
fastcdr-branch: '2.3.x'
45+
fastdds-python-branch: '2.3.x'
46+
discovery-server-branch: 'v2.0.0'
47+
run-build: true
48+
run-tests: true
49+
use-ccache: false
50+
51+
nightly-ubuntu-ci-4_0_x-fast-3_2_x:
52+
strategy:
53+
fail-fast: false
54+
matrix:
55+
java-version:
56+
- 'openjdk-11-jdk'
57+
- 'openjdk-19-jdk'
58+
uses: eProsima/Fast-DDS-Gen/.github/workflows/[email protected]
59+
with:
60+
os-version: 'ubuntu-22.04'
61+
java-version: ${{ matrix.java-version }}
62+
label: 'nightly-ubuntu-ci-4.1.x-3.2.x'
63+
fastddsgen-branch: '4.0.x'
4364
fastdds-branch: '3.2.x'
4465
fastcdr-branch: '2.3.x'
4566
fastdds-python-branch: '2.2.x'

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apply plugin: 'java-library'
1717
apply plugin: 'eclipse' // Eclipse integration
1818

1919
description = """"""
20-
def version_str = "4.1.0"
20+
def version_str = "4.2.0"
2121

2222
import org.apache.tools.ant.taskdefs.condition.Os;
2323
import org.gradle.api.tasks.options.Option;
@@ -91,7 +91,7 @@ repositories {
9191
}
9292

9393
dependencies {
94-
implementation files('thirdparty/idl-parser/build/libs/idlparser-4.1.0.jar')
94+
implementation files('thirdparty/idl-parser/build/libs/idlparser-4.2.0.jar')
9595
testImplementation('org.junit.jupiter:junit-jupiter-api:5.5.2')
9696
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.5.2')
9797
}

0 commit comments

Comments
 (0)