Skip to content

Commit f654ca9

Browse files
EduPonzEduPonz
authored
Prepare 3.0.x-devel to become master (#4723)
* Refs #20893: Upgrade mirror job Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Update readme warning Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Remove 3.0.x rebase workflow Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Prepare CI for master switch Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Update PR template Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Apply Eliana's suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Apply Eliana's suggestions Signed-off-by: eduponz <eduardoponz@eprosima.com> --------- Signed-off-by: eduponz <eduardoponz@eprosima.com>
1 parent 8934b35 commit f654ca9

15 files changed

Lines changed: 97 additions & 123 deletions

‎.github/pull_request_template.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
In case of bug fixes, please provide the list of supported branches where this fix should be also merged.
2222
Please uncomment following line, adjusting the corresponding target branches for the backport.
2323
-->
24-
<!-- @Mergifyio backport 2.13.x 2.10.x 2.6.x -->
24+
<!-- @Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x -->
2525

2626
<!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
2727
<!-- Fixes #(issue) -->
@@ -32,8 +32,8 @@
3232
## Contributor Checklist
3333

3434
<!--
35-
- If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_
36-
- If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox with ❌ or __NO__.
35+
- If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_:
36+
- If any of the elements of the following checklist is not fulfilled on purpose, please provide a reason and substitute the checkbox [ ] with ❌: or __NO__:.
3737
-->
3838

3939
- [ ] Commit messages follow the project guidelines. <!-- External contributors should sign the DCO. Fast DDS developers must also refer to the internal Redmine task. -->
@@ -48,7 +48,6 @@
4848
<!-- - Related documentation PR: eProsima/Fast-DDS-docs#(PR) -->
4949
- [ ] Applicable backports have been included in the description.
5050

51-
5251
## Reviewer Checklist
5352

5453
- [ ] The PR has a milestone assigned.

‎.github/workflows/documentation-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
9191
with:
9292
remote_repository: eProsima/Fast-DDS-python
93-
fallback_branch: ${{ inputs.fastdds_python_branch || '3.0.x-devel' }}
93+
fallback_branch: ${{ inputs.fastdds_python_branch || 'main' }}
9494

9595
- name: Download Fast DDS Python repo
9696
uses: eProsima/eProsima-CI/external/checkout@v0
@@ -104,7 +104,7 @@ jobs:
104104
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
105105
with:
106106
remote_repository: eProsima/Fast-DDS-docs
107-
fallback_branch: ${{ inputs.fastdds_docs_branch || '3.0.x-devel' }}
107+
fallback_branch: ${{ inputs.fastdds_docs_branch || 'master' }}
108108

109109
- name: Download Fast DDS documentation repo
110110
uses: eProsima/eProsima-CI/external/checkout@v0

‎.github/workflows/mac-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ jobs:
4848
colcon-args: ${{ inputs.colcon-args }}
4949
cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
5050
ctest-args: ${{ inputs.ctest-args }}
51-
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x-devel' }}
51+
fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}

‎.github/workflows/mirror.yml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@ on:
33
push:
44
branches:
55
- 'master'
6+
- '2.14.x'
7+
68
jobs:
7-
mirror_job:
9+
mirror_job_master:
10+
if: github.ref == 'refs/heads/master'
811
runs-on: ubuntu-latest
912
name: Mirror master branch to API & ABI compatible minor version branches
1013
strategy:
1114
fail-fast: false
1215
matrix:
1316
dest_branch:
1417
- '3.0.x'
18+
- '3.x'
1519
steps:
1620
- name: Mirror action step
1721
id: mirror
@@ -20,3 +24,21 @@ jobs:
2024
github-token: ${{ secrets.GITHUB_TOKEN }}
2125
source: 'master'
2226
dest: ${{ matrix.dest_branch }}
27+
28+
mirror_job_2_x:
29+
if: github.ref == 'refs/heads/2.14.x'
30+
runs-on: ubuntu-latest
31+
name: Mirror master branch to API & ABI compatible minor version branches
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
dest_branch:
36+
- '2.x'
37+
steps:
38+
- name: Mirror action step
39+
id: mirror
40+
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
41+
with:
42+
github-token: ${{ secrets.GITHUB_TOKEN }}
43+
source: '2.14.x'
44+
dest: ${{ matrix.dest_branch }}

‎.github/workflows/nightly-mac-ci.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ jobs:
2020
ctest-args: "-LE xfail"
2121
fastdds-branch: 'master'
2222

23+
nightly-mac-ci-2_14_x:
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
security:
28+
- 'ON'
29+
- 'OFF'
30+
uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@2.14.x
31+
with:
32+
label: 'nightly-sec-${{ matrix.security }}-mac-ci-2.14.x'
33+
cmake-args: "-DSECURITY=${{ matrix.security }}"
34+
ctest-args: "-LE xfail"
35+
fastdds-branch: '2.14.x'
36+
2337
nightly-mac-ci-2_13_x:
2438
strategy:
2539
fail-fast: false
@@ -61,17 +75,3 @@ jobs:
6175
cmake-args: "-DSECURITY=${{ matrix.security }}"
6276
ctest-args: "-LE xfail"
6377
fastdds-branch: '2.6.x'
64-
65-
nightly-mac-ci-3_0_x-devel:
66-
strategy:
67-
fail-fast: false
68-
matrix:
69-
security:
70-
- 'ON'
71-
- 'OFF'
72-
uses: eProsima/Fast-DDS/.github/workflows/reusable-mac-ci.yml@3.0.x-devel
73-
with:
74-
label: 'nightly-sec-${{ matrix.security }}-mac-ci-3.0.x-devel'
75-
cmake-args: "-DSECURITY=${{ matrix.security }}"
76-
ctest-args: "-LE xfail"
77-
fastdds-branch: '3.0.x-devel'

‎.github/workflows/nightly-sanitizers-ci.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ jobs:
2020
fastdds_ref: 'master'
2121
discovery_server_ref: 'master'
2222

23+
nightly-sanitizers-ci-2_14_x:
24+
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.14.x
25+
with:
26+
label: 'nightly-sec-sanitizers-ci-2.14.x'
27+
run_asan_fastdds: true
28+
run_asan_discovery_server: true
29+
run_tsan_fastdds: true
30+
colcon_build_args: ''
31+
colcon_test_args: ''
32+
cmake_args: ''
33+
ctest_args: ''
34+
fastdds_ref: '2.14.x'
35+
discovery_server_ref: 'v1.2.2'
36+
2337
nightly-sanitizers-ci-2_13_x:
2438
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@2.13.x
2539
with:
@@ -61,17 +75,3 @@ jobs:
6175
ctest_args: ''
6276
fastdds_ref: '2.6.x'
6377
discovery_server_ref: 'v1.2.1'
64-
65-
nightly-sanitizers-ci-3_0_x-devel:
66-
uses: eProsima/Fast-DDS/.github/workflows/reusable-sanitizers-ci.yml@3.0.x-devel
67-
with:
68-
label: 'nightly-sec-sanitizers-ci-3.0.x-devel'
69-
run_asan_fastdds: true
70-
run_asan_discovery_server: true
71-
run_tsan_fastdds: true
72-
colcon_build_args: ''
73-
colcon_test_args: ''
74-
cmake_args: ''
75-
ctest_args: ''
76-
fastdds_ref: '3.0.x-devel'
77-
discovery_server_ref: '3.0.x-devel'

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
ctest-args: "-LE xfail"
2424
fastdds-branch: 'master'
2525

26-
nightly-ubuntu-ci-2_13_x:
26+
nightly-ubuntu-ci-2_14_x:
2727
strategy:
2828
fail-fast: false
2929
matrix:
@@ -32,15 +32,15 @@ jobs:
3232
security:
3333
- 'ON'
3434
- 'OFF'
35-
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
35+
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.14.x
3636
with:
3737
os-image: ${{ matrix.os-image }}
38-
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
38+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.14.x'
3939
cmake-args: "-DSECURITY=${{ matrix.security }}"
4040
ctest-args: "-LE xfail"
41-
fastdds-branch: '2.13.x'
41+
fastdds-branch: '2.14.x'
4242

43-
nightly-ubuntu-ci-2_10_x:
43+
nightly-ubuntu-ci-2_13_x:
4444
strategy:
4545
fail-fast: false
4646
matrix:
@@ -49,15 +49,15 @@ jobs:
4949
security:
5050
- 'ON'
5151
- 'OFF'
52-
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
52+
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.13.x
5353
with:
5454
os-image: ${{ matrix.os-image }}
55-
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
55+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.13.x'
5656
cmake-args: "-DSECURITY=${{ matrix.security }}"
5757
ctest-args: "-LE xfail"
58-
fastdds-branch: '2.10.x'
58+
fastdds-branch: '2.13.x'
5959

60-
nightly-ubuntu-ci-2_6_x:
60+
nightly-ubuntu-ci-2_10_x:
6161
strategy:
6262
fail-fast: false
6363
matrix:
@@ -66,15 +66,15 @@ jobs:
6666
security:
6767
- 'ON'
6868
- 'OFF'
69-
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
69+
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.10.x
7070
with:
7171
os-image: ${{ matrix.os-image }}
72-
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
72+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.10.x'
7373
cmake-args: "-DSECURITY=${{ matrix.security }}"
7474
ctest-args: "-LE xfail"
75-
fastdds-branch: '2.6.x'
75+
fastdds-branch: '2.10.x'
7676

77-
nightly-ubuntu-ci-3_0_x-devel:
77+
nightly-ubuntu-ci-2_6_x:
7878
strategy:
7979
fail-fast: false
8080
matrix:
@@ -83,10 +83,10 @@ jobs:
8383
security:
8484
- 'ON'
8585
- 'OFF'
86-
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@3.0.x-devel
86+
uses: eProsima/Fast-DDS/.github/workflows/reusable-ubuntu-ci.yml@2.6.x
8787
with:
8888
os-image: ${{ matrix.os-image }}
89-
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-3.0.x-devel'
89+
label: '${{ matrix.os-image }}-nightly-sec-${{ matrix.security }}-ubuntu-ci-2.6.x'
9090
cmake-args: "-DSECURITY=${{ matrix.security }}"
9191
ctest-args: "-LE xfail"
92-
fastdds-branch: '3.0.x-devel'
92+
fastdds-branch: '2.6.x'

‎.github/workflows/nightly-windows-ci.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,20 @@ jobs:
2020
ctest-args: "-LE xfail"
2121
fastdds_branch: 'master'
2222

23+
nightly-windows-ci-2_14_x:
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
security:
28+
- 'ON'
29+
- 'OFF'
30+
uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@2.14.x
31+
with:
32+
label: 'nightly-sec-${{ matrix.security }}-windows-ci-2.14.x'
33+
cmake-args: "-DSECURITY=${{ matrix.security }}"
34+
ctest-args: "-LE xfail"
35+
fastdds_branch: '2.14.x'
36+
2337
nightly-windows-ci-2_13_x:
2438
strategy:
2539
fail-fast: false
@@ -61,17 +75,3 @@ jobs:
6175
cmake-args: "-DSECURITY=${{ matrix.security }}"
6276
ctest-args: "-LE xfail"
6377
fastdds_branch: '2.6.x'
64-
65-
nightly-windows-ci-3_0_x-devel:
66-
strategy:
67-
fail-fast: false
68-
matrix:
69-
security:
70-
- 'ON'
71-
- 'OFF'
72-
uses: eProsima/Fast-DDS/.github/workflows/reusable-windows-ci.yml@3.0.x-devel
73-
with:
74-
label: 'nightly-sec-${{ matrix.security }}-windows-ci-3.0.x-devel'
75-
cmake-args: "-DSECURITY=${{ matrix.security }}"
76-
ctest-args: "-LE xfail"
77-
fastdds_branch: '3.0.x-devel'

‎.github/workflows/rebase-3.0.x-devel.yaml‎

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

‎.github/workflows/reusable-sanitizers-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
colcon_meta_file: ${{ github.workspace }}/src/fastdds/.github/workflows/config/asan_colcon.meta
176176
colcon_build_args: ${{ inputs.colcon_build_args }}
177177
cmake_args: ${{ inputs.cmake_args }}
178-
cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -Dfastdds_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
178+
cmake_args_default: -DEPROSIMA_BUILD_TESTS=ON -DRTPS_API_TESTS=ON -DFASTDDS_PIM_API_TESTS=ON -DPERFORMANCE_TESTS=ON
179179
cmake_build_type: 'Debug'
180180
workspace: ${{ github.workspace }}
181181
workspace_dependencies: ''

0 commit comments

Comments
 (0)