Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<!-- @Mergifyio backport 4.1.x 4.0.x 3.3.x 2.1.x -->
<!-- @Mergifyio backport 4.2.x 4.1.x 4.0.x 3.3.x 2.1.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:
- '4.2.x'
- '4.3.x'
- '4.x'
steps:
- name: Mirror action step
Expand Down
33 changes: 27 additions & 6 deletions .github/workflows/nightly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-19-jdk'
uses: eProsima/Fast-DDS-Gen/.github/workflows/[email protected]
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-17-jdk'
- 'openjdk-21-jdk'
- 'openjdk-11-jdk'
- 'openjdk-19-jdk'
uses: eProsima/Fast-DDS-Gen/.github/workflows/[email protected]
with:
os-version: 'ubuntu-22.04'
Expand All @@ -53,8 +74,8 @@ jobs:
fail-fast: false
matrix:
java-version:
- 'openjdk-17-jdk'
- 'openjdk-21-jdk'
- 'openjdk-11-jdk'
- 'openjdk-19-jdk'
uses: eProsima/Fast-DDS-Gen/.github/workflows/[email protected]
with:
os-version: 'ubuntu-22.04'
Expand All @@ -74,8 +95,8 @@ jobs:
fail-fast: false
matrix:
java-version:
- 'openjdk-17-jdk'
- 'openjdk-21-jdk'
- 'openjdk-11-jdk'
- 'openjdk-19-jdk'
fastcdr-branch:
- '1.1.x'
- '2.x'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weekly-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
uses: eProsima/Fast-DDS-Gen/.github/workflows/[email protected]
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'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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')
}
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/idl-parser
Loading