Skip to content

Fix CI and Multiple main -> master changes #290

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.

Sign up for GitHub

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

Merged
emiliocuestaf merged 1 commit into from
Apr 9, 2026
Merged

Fix CI and Multiple main -> master changes #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/mirror.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Mirror
on:
push:
branches:
- 'main'
- 'master'
jobs:
mirror_job:
runs-on: ubuntu-latest
name: Mirror main branch to compatible minor version branches
name: Mirror master branch to compatible minor version branches
strategy:
fail-fast: false
matrix:
Expand All @@ -20,5 +20,5 @@ jobs:
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
source: 'main'
source: 'master'
dest: ${{ matrix.dest_branch }}
10 changes: 5 additions & 5 deletions .github/workflows/nightly-ubuntu-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
- cron: '0 1 * * *'

jobs:
# python main - fastdds master
nightly-ubuntu-ci-main:
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@main
# python master - fastdds master
nightly-ubuntu-ci-master:
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@master
with:
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
os-version: 'ubuntu-22.04'
label: 'nightly-ubuntu-ci-main-master'
fastdds-python-branch: 'main'
label: 'nightly-ubuntu-ci-master-master'
fastdds-python-branch: 'master'
fastdds-branch: 'master'
run-build: true
run-tests: true
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/nightly-windows-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ on:
- cron: '0 1 * * *'

jobs:
# python main - fastdds master
nightly-windows-ci-main:
# python master - fastdds master
nightly-windows-ci-master:
strategy:
fail-fast: false
matrix:
vs-toolset:
- 'v142'
- 'v143'
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@main
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@master
with:
os-version: 'windows-2022'
vs-toolset: ${{ matrix.vs-toolset }}
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-main-master'
fastdds-python-branch: 'main'
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-master-master'
fastdds-python-branch: 'master'
fastdds-branch: 'master'
run-build: true
run-tests: true
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ cd <path_to_ws>
mkdir -p fastdds_python_ws/src
cd fastdds_python_ws
# Get workspace setup file
wget https://raw.githubusercontent.com/eProsima/Fast-DDS-python/main/fastdds_python.repos
wget https://raw.githubusercontent.com/eProsima/Fast-DDS-python/master/fastdds_python.repos
# Download repositories
vcs import src < fastdds_python.repos
# Build the workspace
Expand Down
Loading