Skip to content

Commit 6b66cec

Browse files
authored
Bump main branch to use Fast DDS v3 (#110)
* Bump main branch to use Fast DDS v3 Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Select correct reusable workflow version Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Rename workflows Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Bump fastdds version in .repos file Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Add warning message in README Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> --------- Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com>
1 parent de170c0 commit 6b66cec

5 files changed

Lines changed: 43 additions & 12 deletions

File tree

.github/workflows/mirror.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: mirror-branch
2+
3+
on:
4+
push:
5+
branches:
6+
- 'main'
7+
8+
jobs:
9+
mirror_job_main:
10+
if: github.ref == 'refs/heads/main'
11+
runs-on: ubuntu-latest
12+
name: Mirror main branch to API & ABI compatible minor version branches
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
dest_branch:
17+
- '1.x'
18+
steps:
19+
- name: Mirror action step
20+
id: mirror
21+
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
22+
with:
23+
github-token: ${{ secrets.GITHUB_TOKEN }}
24+
source: 'master'
25+
dest: ${{ matrix.dest_branch }}

.github/workflows/nightly.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Nightly test workflow for dev-utils
2-
name: nightly
2+
name: nightly-dev-utils
33

44
on:
55
schedule:
@@ -9,17 +9,16 @@ jobs:
99

1010
reusable_tests_v2:
1111
name: reusable_tests_v2
12-
uses: ./.github/workflows/reusable-workflow.yml
12+
uses: eProsima/dev-utils/.github/workflows/reusable-workflow.yml@0.x
1313
with:
1414
custom_version_build: 'v2'
1515
dependencies_artifact_postfix: '_nightly'
1616
secrets: inherit
1717

18-
# Uncomment this block to run the tests for Fast DDS v3 when dev-utils is updated
19-
# reusable_tests_v3:
20-
# name: reusable_tests_v3
21-
# uses: ./.github/workflows/reusable-workflow.yml
22-
# with:
23-
# custom_version_build: 'v3'
24-
# dependencies_artifact_postfix: '_nightly'
25-
# secrets: inherit
18+
reusable_tests_v3:
19+
name: reusable_tests_v3
20+
uses: eProsima/dev-utils/.github/workflows/reusable-workflow.yml@main
21+
with:
22+
custom_version_build: 'v3'
23+
dependencies_artifact_postfix: '_nightly'
24+
secrets: inherit

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ jobs:
3232
name: reusable_tests
3333
uses: ./.github/workflows/reusable-workflow.yml
3434
with:
35-
custom_version_build: ${{ github.event.inputs.custom_version_build || 'v2' }}
35+
custom_version_build: ${{ github.event.inputs.custom_version_build || 'v3' }}
3636
dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix || '_nightly' }}
3737
secrets: inherit

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
[![test](https://github.com/eProsima/dev-utils/actions/workflows/test.yml/badge.svg)](https://github.com/eProsima/dev-utils/actions/workflows/test.yml)
1111
[![codecov](https://codecov.io/gh/eProsima/dev-utils/branch/main/graph/badge.svg?token=6NA5PVA9QL)](https://codecov.io/gh/eProsima/dev-utils)
1212

13+
<br><br>
14+
15+
<!-- TODO(rsanchez15): Remove this before releasing v3.0.0 -->
16+
> [!WARNING]
17+
> **In preparation for Fast DDS v3.0.0, eProsima/dev-utils' master branch is undergoing major changes entailing API breaks.**
18+
> **Until Fast DDS v3.0.0 is released, it is strongly advisable to use the latest stable branch, [0.x](https://github.com/eProsima/dev-utils/tree/0.x), which uses Fast DDS 2.14.x**.
19+
1320
The packages that conform this repository are:
1421

1522
* **CMake utils**: `cmake_utils` CMake utilities to build packages.

dev_utils.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories:
1010
fastdds:
1111
type: git
1212
url: https://github.com/eProsima/Fast-DDS.git
13-
version: 2.x
13+
version: 3.x
1414
dev_utils:
1515
type: git
1616
url: https://github.com/eProsima/dev-utils.git

0 commit comments

Comments
 (0)