Skip to content

Commit 1665764

Browse files
Multiple "main" to "master" changes (#290)
Signed-off-by: Emilio Cuesta <emiliocuesta@eprosima.com>
1 parent eec76da commit 1665764

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/mirror.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Mirror
33
on:
44
push:
55
branches:
6-
- 'main'
6+
- 'master'
77
jobs:
88
mirror_job:
99
runs-on: ubuntu-latest
10-
name: Mirror main branch to compatible minor version branches
10+
name: Mirror master branch to compatible minor version branches
1111
strategy:
1212
fail-fast: false
1313
matrix:
@@ -20,5 +20,5 @@ jobs:
2020
uses: eProsima/eProsima-CI/external/mirror-branch-action@v0
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
23-
source: 'main'
23+
source: 'master'
2424
dest: ${{ matrix.dest_branch }}

.github/workflows/nightly-ubuntu-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
- cron: '0 1 * * *'
77

88
jobs:
9-
# python main - fastdds master
10-
nightly-ubuntu-ci-main:
11-
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@main
9+
# python master - fastdds master
10+
nightly-ubuntu-ci-master:
11+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-ubuntu-ci.yml@master
1212
with:
1313
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
1414
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
1515
os-version: 'ubuntu-22.04'
16-
label: 'nightly-ubuntu-ci-main-master'
17-
fastdds-python-branch: 'main'
16+
label: 'nightly-ubuntu-ci-master-master'
17+
fastdds-python-branch: 'master'
1818
fastdds-branch: 'master'
1919
run-build: true
2020
run-tests: true

.github/workflows/nightly-windows-ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ on:
66
- cron: '0 1 * * *'
77

88
jobs:
9-
# python main - fastdds master
10-
nightly-windows-ci-main:
9+
# python master - fastdds master
10+
nightly-windows-ci-master:
1111
strategy:
1212
fail-fast: false
1313
matrix:
1414
vs-toolset:
1515
- 'v142'
1616
- 'v143'
17-
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@main
17+
uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@master
1818
with:
1919
os-version: 'windows-2022'
2020
vs-toolset: ${{ matrix.vs-toolset }}
21-
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-main-master'
22-
fastdds-python-branch: 'main'
21+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-master-master'
22+
fastdds-python-branch: 'master'
2323
fastdds-branch: 'master'
2424
run-build: true
2525
run-tests: true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ cd <path_to_ws>
6161
mkdir -p fastdds_python_ws/src
6262
cd fastdds_python_ws
6363
# Get workspace setup file
64-
wget https://raw.githubusercontent.com/eProsima/Fast-DDS-python/main/fastdds_python.repos
64+
wget https://raw.githubusercontent.com/eProsima/Fast-DDS-python/master/fastdds_python.repos
6565
# Download repositories
6666
vcs import src < fastdds_python.repos
6767
# Build the workspace

0 commit comments

Comments
 (0)