diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 981dbde..058edf1 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -16,7 +16,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. --> - + @@ -32,6 +32,11 @@ Related implementation PR: ## Contributor Checklist + + - [ ] Commit messages follow the project guidelines. - [ ] Changes do not break current interoperability. - [ ] New feature has been documented/Current behavior is correctly described in the documentation. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e4102b..099a345 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,11 +14,11 @@ on: fastdds_branch: description: 'Fast-DDS branch to be used' required: false - default: '3.0.x-devel' + default: 'master' pull_request: push: branches: - - 3.0.x-devel + - master schedule: - cron: '0 0 * * *' @@ -61,7 +61,7 @@ jobs: with: foonathan-memory-vendor-branch: ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }} fastcdr-branch: ${{ matrix.fastcdr_version }} - fastdds-branch: ${{ github.event.inputs.fastdds_branch || '3.0.x-devel' }} + fastdds-branch: ${{ github.event.inputs.fastdds_branch || 'master' }} - uses: eProsima/eProsima-CI/external/get-cmake@v0 with: @@ -126,7 +126,7 @@ jobs: with: foonathan-memory-vendor-branch: ${{ github.event.inputs.foonathan_memory_vendor_branch || 'master' }} fastcdr-branch: ${{ matrix.fastcdr_version }} - fastdds-branch: ${{ github.event.inputs.fastdds_branch || '3.0.x-devel' }} + fastdds-branch: ${{ github.event.inputs.fastdds_branch || 'master' }} - uses: eProsima/eProsima-CI/external/get-cmake@v0 with: diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index fd5da27..436752a 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -3,16 +3,19 @@ on: push: branches: - 'master' + - '2.14.x' jobs: - mirror_job: + mirror_job_master: + if: github.ref == 'refs/heads/master' name: Mirror master branch to latest minor branches runs-on: ubuntu-latest strategy: fail-fast: false matrix: dest_branch: - - '2.14.x' + - '3.0.x' + - '3.x' steps: - name: Mirror action step id: mirror @@ -21,3 +24,21 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} source: 'master' dest: ${{ matrix.dest_branch }} + + mirror_job_2_x: + if: github.ref == 'refs/heads/2.14.x' + name: Mirror 2.14.x branch to latest minor branches + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + dest_branch: + - '2.x' + steps: + - name: Mirror action step + id: mirror + uses: eProsima/eProsima-CI/external/mirror-branch-action@main + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + source: '2.14.x' + dest: ${{ matrix.dest_branch }} diff --git a/README.md b/README.md index e802b97..a4b8e95 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # eProsima Fast DDS Shapes Demo + +> [!WARNING] +> **In preparation for v3.0.0, Fast DDS' master branch is undergoing major changes entailing API breaks.** +> **Until Fast DDS v3.0.0 is released, it is strongly advisable to use the latest stable branch, [2.14.x](https://github.com/eProsima/Fast-DDS/tree/2.14.x)** + eProsima Shapes Demo is an application in which Publishers and Subscribers are shapes of different colors and sizes moving on a board. Each shape refers to its own topic: Square, Triangle or Circle.