Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20893] Prepare 3.0.x-devel to become master #127

Merged
merged 4 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<!-- @Mergifyio backport 2.13.x 2.10.x 2.6.x -->
<!-- @Mergifyio backport 2.14.x 2.13.x 2.10.x 2.6.x -->

<!-- If an issue is already opened, please uncomment next line with the corresponding issue number. -->
<!-- Fixes #(issue) -->
Expand All @@ -32,6 +32,11 @@ Related implementation PR:

## Contributor Checklist

<!--
- If any of the elements of the following checklist is not applicable, substitute the checkbox [ ] by _N/A_:
- 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__:.
-->

- [ ] Commit messages follow the project guidelines. <!-- External contributors should sign the DCO. ShapesDemo developers must also refer to the internal Redmine task. -->
- [ ] Changes do not break current interoperability.
- [ ] New feature has been documented/Current behavior is correctly described in the documentation. <!-- Please uncomment following line with the corresponding PR to the documentation project: -->
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 * * *'

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
25 changes: 23 additions & 2 deletions .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Loading