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

Bump main branch to use Fast DDS v3 #110

Merged
merged 5 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
25 changes: 25 additions & 0 deletions .github/workflows/mirror.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: mirror-branch

on:
push:
branches:
- 'main'

jobs:
mirror_job_main:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
name: Mirror main branch to API & ABI compatible minor version branches
strategy:
fail-fast: false
matrix:
dest_branch:
- '1.x'
steps:
- name: Mirror action step
id: mirror
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
source: 'master'
dest: ${{ matrix.dest_branch }}
19 changes: 9 additions & 10 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Nightly test workflow for dev-utils
name: nightly
name: nightly-dev-utils

on:
schedule:
Expand All @@ -9,17 +9,16 @@ jobs:

reusable_tests_v2:
name: reusable_tests_v2
uses: ./.github/workflows/reusable-workflow.yml
uses: eProsima/dev-utils/.github/workflows/reusable-workflow.yml@0.x
with:
custom_version_build: 'v2'
dependencies_artifact_postfix: '_nightly'
secrets: inherit

# Uncomment this block to run the tests for Fast DDS v3 when dev-utils is updated
# reusable_tests_v3:
# name: reusable_tests_v3
# uses: ./.github/workflows/reusable-workflow.yml
# with:
# custom_version_build: 'v3'
# dependencies_artifact_postfix: '_nightly'
# secrets: inherit
reusable_tests_v3:
name: reusable_tests_v3
uses: eProsima/dev-utils/.github/workflows/reusable-workflow.yml@main
with:
custom_version_build: 'v3'
dependencies_artifact_postfix: '_nightly'
secrets: inherit
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ jobs:
name: reusable_tests
uses: ./.github/workflows/reusable-workflow.yml
with:
custom_version_build: ${{ github.event.inputs.custom_version_build || 'v2' }}
custom_version_build: ${{ github.event.inputs.custom_version_build || 'v3' }}
dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix || '_nightly' }}
secrets: inherit
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
[![test](https://github.com/eProsima/dev-utils/actions/workflows/test.yml/badge.svg)](https://github.com/eProsima/dev-utils/actions/workflows/test.yml)
[![codecov](https://codecov.io/gh/eProsima/dev-utils/branch/main/graph/badge.svg?token=6NA5PVA9QL)](https://codecov.io/gh/eProsima/dev-utils)

<br><br>

<!-- TODO(rsanchez15): Remove this before releasing v3.0.0 -->
> [!WARNING]
> **In preparation for Fast DDS v3.0.0, eProsima/dev-utils' 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, [0.x](https://github.com/eProsima/dev-utils/tree/0.x), which uses Fast DDS 2.14.x**.

The packages that conform this repository are:

* **CMake utils**: `cmake_utils` CMake utilities to build packages.
Expand Down
2 changes: 1 addition & 1 deletion dev_utils.repos
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories:
fastdds:
type: git
url: https://github.com/eProsima/Fast-DDS.git
version: 2.x
version: 3.x
dev_utils:
type: git
url: https://github.com/eProsima/dev-utils.git
Expand Down
Loading