Skip to content

Commit 4582f58

Browse files
committed
Prepare 3.0.x-devel to become main (#122)
* Refs #20893: Add warning in README Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Bump version to 2.0.0 Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Update PR template Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Update mirror workflow Signed-off-by: eduponz <eduardoponz@eprosima.com> * Refs #20893: Update ci workflow 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 ac4070a commit 4582f58

5 files changed

Lines changed: 37 additions & 7 deletions

File tree

.github/pull_request_template.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727

2828
## Contributor Checklist
2929

30+
<!--
31+
- If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_:
32+
- 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__:.
33+
-->
34+
3035
- [ ] Commit messages follow the project guidelines. <!-- External contributors should sign the DCO. Fast DDS Python developers must also refer to the internal Redmine task. -->
3136
- [ ] Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
3237
- [ ] Changes are API compatible. <!-- Public API must not be broken within the same major release. -->

.github/workflows/build_and_test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ on:
1414
fastdds_branch:
1515
description: 'Fast DDS branch to be used'
1616
required: false
17-
default: '3.0.x-devel'
17+
default: 'master'
1818
pull_request:
1919
push:
2020
branches:
21-
- 3.0.x-devel
21+
- main
2222
schedule:
2323
- cron: '0 0 * * *'
2424

@@ -36,7 +36,7 @@ jobs:
3636
- ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }}
3737
fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["master"]') }}
3838
fastdds_version:
39-
- ${{ github.event.inputs.fastdds_branch || '3.0.x-devel' }}
39+
- ${{ github.event.inputs.fastdds_branch || 'master' }}
4040

4141
env:
4242
CXXFLAGS: /MP
@@ -155,7 +155,7 @@ jobs:
155155
- ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }}
156156
fastcdr_version: ${{ fromJson(github.event.inputs.fastcdr_versions || '["master"]') }}
157157
fastdds_version:
158-
- ${{ github.event.inputs.fastdds_branch || '3.0.x-devel' }}
158+
- ${{ github.event.inputs.fastdds_branch || 'master' }}
159159

160160

161161
steps:

.github/workflows/mirror.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ on:
33
push:
44
branches:
55
- 'main'
6+
- '1.4.x'
67
jobs:
7-
mirror_job:
8+
mirror_job_main:
9+
if: github.ref == 'refs/heads/main'
810
runs-on: ubuntu-latest
911
name: Mirror main branch to compatible minor version branches
1012
strategy:
1113
fail-fast: false
1214
matrix:
1315
dest_branch:
14-
- '1.4.x'
16+
- '2.0.x'
17+
- '2.x'
1518
steps:
1619
- name: Mirror action step
1720
id: mirror
@@ -20,3 +23,21 @@ jobs:
2023
github-token: ${{ secrets.GITHUB_TOKEN }}
2124
source: 'main'
2225
dest: ${{ matrix.dest_branch }}
26+
27+
mirror_job_1_x:
28+
if: github.ref == 'refs/heads/1.4.x'
29+
runs-on: ubuntu-latest
30+
name: Mirror 1.4.x branch to compatible version branches
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
dest_branch:
35+
- '1.x'
36+
steps:
37+
- name: Mirror action step
38+
id: mirror
39+
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
40+
with:
41+
github-token: ${{ secrets.GITHUB_TOKEN }}
42+
source: '1.4.x'
43+
dest: ${{ matrix.dest_branch }}

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
[![Forks](https://img.shields.io/github/forks/eProsima/Fast-DDS-python.svg)](https://github.com/eProsima/Fast-DDS-python/network/members)
99
[![Stars](https://img.shields.io/github/stars/eProsima/Fast-DDS-python.svg)](https://github.com/eProsima/Fast-DDS-python/stargazers)
1010

11+
<!-- TODO(eduponz): Remove this before releasing v3.0.0 -->
12+
> [!WARNING]
13+
> In preparation for v2.0.0 (bindings for Fast DDS v3.0.0), Fast DDS Python's master branch is undergoing major changes entailing **API breaks**.
14+
> Until Fast DDS Python v2.0.0 is released, it is strongly advisable to use the latest stable version, [v1.4.1](https://github.com/eProsima/Fast-DDS-python/tree/v1.4.1).
1115
1216
*eProsima Fast DDS Python* is a Python binding for the [*eProsima Fast DDS*](https://github.com/eProsima/Fast-DDS) C++ library.
1317
This is a work in progress, but ultimately the goal is having the complete *Fast DDS* API available in Python.

fastdds_python/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if(POLICY CMP0086)
2424
cmake_policy(SET CMP0086 NEW)
2525
endif()
2626

27-
project(fastdds_python VERSION 1.4.1)
27+
project(fastdds_python VERSION 2.0.0)
2828

2929
# Set BUILD_TESTING to OFF by default.
3030
if(NOT BUILD_TESTING)

0 commit comments

Comments
 (0)