Skip to content

Commit 818a29e

Browse files
Updates on 4.2.x after branchout of 4.3.x (#552)
* Refs #23857. Remove mirror workflow from 4.2.x Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23857. Remove nightly and weekly. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23857. Update branches in ci workflow. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> * Refs #23857. Use jdk-17 instead of jdk-19. Signed-off-by: Miguel Company <miguelcompany@eprosima.com> --------- Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
1 parent 6d6bc7c commit 818a29e

File tree

4 files changed

+9
-150
lines changed

4 files changed

+9
-150
lines changed

.github/workflows/mirror.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 94 deletions
This file was deleted.

.github/workflows/ubuntu-ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ on:
1111
description: 'Branch or tag of Fast DDS repository'
1212
required: false
1313
type: string
14-
default: 'master'
14+
default: '3.4.x'
1515
fastcdr-branch:
1616
description: 'Branch or tag of Fast CDR repository'
1717
required: false
1818
type: string
19-
default: 'master'
19+
default: '2.3.x'
2020
fastdds-python-branch:
2121
description: 'Branch or tag of Fast DDS Python repository'
2222
required: false
2323
type: string
24-
default: 'main'
24+
default: '2.4.x'
2525
discovery-server-branch:
2626
description: 'Branch or tag of Discovery Server repository'
2727
required: false
2828
type: string
29-
default: 'master'
29+
default: '2.2.x'
3030
run-tests:
3131
description: 'Run test suite of Fast DDS Gen'
3232
required: false
@@ -57,7 +57,7 @@ jobs:
5757
matrix:
5858
java-version:
5959
- 'openjdk-11-jdk'
60-
- 'openjdk-19-jdk'
60+
- 'openjdk-17-jdk'
6161

6262
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
6363
uses: ./.github/workflows/reusable-ubuntu-ci.yml
@@ -68,10 +68,10 @@ jobs:
6868
java-version: ${{ matrix.java-version }}
6969
label: 'ubuntu-ci-${{ matrix.java-version }}'
7070
fastddsgen-branch: ${{ inputs.fastddsgen-branch || github.ref }}
71-
fastdds-branch: ${{ inputs.fastdds-branch || 'master' }}
72-
fastcdr-branch: ${{ inputs.fastcdr-branch || 'master' }}
73-
fastdds-python-branch: ${{ inputs.fastdds-python-branch || 'main' }}
74-
discovery-server-branch: ${{ inputs.discovery-server-branch || 'master' }}
71+
fastdds-branch: ${{ inputs.fastdds-branch || '3.4.x' }}
72+
fastcdr-branch: ${{ inputs.fastcdr-branch || '2.3.x' }}
73+
fastdds-python-branch: ${{ inputs.fastdds-python-branch || '2.4.x' }}
74+
discovery-server-branch: ${{ inputs.discovery-server-branch || '2.2.x' }}
7575
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
7676
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
7777
use-ccache: ${{ (inputs.use-ccache == true) || false }}

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)