diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index ab4aaa87..f5ee252e 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -17,7 +17,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 666f5571..f577c702 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: dest_branch: - - '4.2.x' + - '4.3.x' - '4.x' steps: - name: Mirror action step diff --git a/.github/workflows/nightly-ubuntu-ci.yml b/.github/workflows/nightly-ubuntu-ci.yml index 5ed1f0b9..409f3fae 100644 --- a/.github/workflows/nightly-ubuntu-ci.yml +++ b/.github/workflows/nightly-ubuntu-ci.yml @@ -27,13 +27,34 @@ jobs: run-tests: true use-ccache: false + nightly-ubuntu-ci-4_2_x-fast-3_4_x: + strategy: + fail-fast: false + matrix: + java-version: + - 'openjdk-11-jdk' + - 'openjdk-17-jdk' + uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@4.2.x + with: + os-version: 'ubuntu-22.04' + java-version: ${{ matrix.java-version }} + label: 'nightly-ubuntu-ci-4.2.x-3.4.x' + fastddsgen-branch: '4.2.x' + fastdds-branch: '3.4.x' + fastcdr-branch: '2.3.x' + fastdds-python-branch: '2.3.x' + discovery-server-branch: 'v2.0.0' + run-build: true + run-tests: true + use-ccache: false + nightly-ubuntu-ci-4_1_x-fast-3_3_x: strategy: fail-fast: false matrix: java-version: + - 'openjdk-11-jdk' - 'openjdk-17-jdk' - - 'openjdk-21-jdk' uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@4.1.x with: os-version: 'ubuntu-22.04' @@ -53,8 +74,8 @@ jobs: fail-fast: false matrix: java-version: + - 'openjdk-11-jdk' - 'openjdk-17-jdk' - - 'openjdk-21-jdk' uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@4.0.x with: os-version: 'ubuntu-22.04' @@ -74,8 +95,8 @@ jobs: fail-fast: false matrix: java-version: + - 'openjdk-11-jdk' - 'openjdk-17-jdk' - - 'openjdk-21-jdk' fastcdr-branch: - '1.1.x' - '2.x' diff --git a/.github/workflows/weekly-ubuntu-ci.yml b/.github/workflows/weekly-ubuntu-ci.yml index 00973012..4e657459 100644 --- a/.github/workflows/weekly-ubuntu-ci.yml +++ b/.github/workflows/weekly-ubuntu-ci.yml @@ -10,7 +10,7 @@ jobs: uses: eProsima/Fast-DDS-Gen/.github/workflows/reusable-ubuntu-ci.yml@2.1.x with: os-version: 'ubuntu-20.04' - java-version: 'openjdk-17-jdk' + java-version: 'openjdk-11-jdk' label: 'weekly-ubuntu-ci-2.1.x' fastddsgen-branch: '2.1.x' fastdds-branch: '2.6.x' diff --git a/build.gradle b/build.gradle index fb979122..78489c04 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ apply plugin: 'java-library' apply plugin: 'eclipse' // Eclipse integration description = """""" -def version_str = "4.2.0" +def version_str = "4.3.0" import org.apache.tools.ant.taskdefs.condition.Os; import org.gradle.api.tasks.options.Option; @@ -91,7 +91,7 @@ repositories { } dependencies { - implementation files('thirdparty/idl-parser/build/libs/idlparser-4.2.0.jar') + implementation files('thirdparty/idl-parser/build/libs/idlparser-4.3.0.jar') testImplementation('org.junit.jupiter:junit-jupiter:5.14.1') testRuntimeOnly('org.junit.platform:junit-platform-launcher') } diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser index a12d6d83..f82a976f 160000 --- a/thirdparty/idl-parser +++ b/thirdparty/idl-parser @@ -1 +1 @@ -Subproject commit a12d6d83de2f04d72c251e76b768b8cf5a51c5e0 +Subproject commit f82a976fb78f48f0e309fe219f51803b1927124e