Skip to content

Commit e1c82d6

Browse files
authored
Merge pull request #2271 from elBoberido/iox-2270-update-links-to-default-branch
iox-#2270 Update links to default branch
2 parents f00cfe0 + f534e86 commit e1c82d6

File tree

32 files changed

+48
-47
lines changed

32 files changed

+48
-47
lines changed

.cirrus.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
---
1414

1515
#
16-
# Filter to run the CI only on the master and release branches or for pull request to the master, release* and iox-* branches
16+
# Filter to run the CI only on the main and release branches or for pull request to the main, release* and iox-* branches
1717
#
1818

19-
only_if: $CIRRUS_BRANCH == 'master'
19+
only_if: $CIRRUS_BRANCH == 'main'
2020
|| $CIRRUS_BRANCH == 'release*'
21-
|| ($CIRRUS_PR != '' && ($CIRRUS_BASE_BRANCH == 'master'
21+
|| ($CIRRUS_PR != '' && ($CIRRUS_BASE_BRANCH == 'main'
2222
|| $CIRRUS_BASE_BRANCH == 'release*'
2323
|| $CIRRUS_BASE_BRANCH == 'iox-*'
2424
)

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ E.g. Ubuntu 18.04 LTS
1616
E.g. GCC 7.4.0
1717

1818
**Eclipse iceoryx version:**
19-
E.g. `v1.2.3` or `master` branch
19+
E.g. `v1.2.3` or `main` branch
2020

2121
**Observed result or behaviour:**
2222
A clear and precise description of the observed result.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
[commit-guidelines]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
2222
[eca]: http://www.eclipse.org/legal/ECA.php
23-
[contributing]: https://github.com/eclipse-iceoryx/iceoryx/blob/master/CONTRIBUTING.md#coding-style
24-
[testing]: https://github.com/eclipse-iceoryx/iceoryx/blob/master/doc/website/concepts/best-practice-for-testing.md
25-
[changelog]: https://github.com/eclipse-iceoryx/iceoryx/blob/master/doc/website/release-notes/iceoryx-unreleased.md
23+
[contributing]: https://github.com/eclipse-iceoryx/iceoryx/blob/main/CONTRIBUTING.md#coding-style
24+
[testing]: https://github.com/eclipse-iceoryx/iceoryx/blob/main/doc/website/concepts/best-practice-for-testing.md
25+
[changelog]: https://github.com/eclipse-iceoryx/iceoryx/blob/main/doc/website/release-notes/iceoryx-unreleased.md
2626

2727
## Checklist for the PR Reviewer
2828

.github/workflows/build-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
name: Build & Test
44

5-
# Triggers the workflow on push or pull request events but only for the master branch
5+
# Triggers the workflow on push or pull request events but only for the main branch
66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master, release*, iox-* ]
10+
branches: [ main, release*, iox-* ]
1111

1212
jobs:
1313
pre-flight-check:

.github/workflows/lint_pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Code Linting on Pull-Requests
22

33
on:
44
pull_request:
5-
branches: [ master, release*, iox-* ]
5+
branches: [ main, release*, iox-* ]
66

77
jobs:
88
clang-tidy-review:

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Please make sure you have:
5555
5. All commits have been signed with `git commit -s`
5656
6. The `iceoryx-unreleased.md` in `doc/website/release-notes` is updated with the GitHub issue
5757
that is closed by the Pull-Request
58-
7. You open your pull request towards the base branch `master`
58+
7. You open your pull request towards the base branch `main`
5959
8. Link the pull request to the according GitHub issue and set the label accordingly
6060

6161
**NOTE:** For support while developing you can use little helper scripts, see [git-hooks](./tools/git-hooks/Readme.md).
@@ -76,7 +76,7 @@ will be no community support and they might be removed at a later stage.
7676

7777
## Branching strategy
7878

79-
`master`
79+
`main`
8080

8181
* Main development branch
8282
* Open for external contributions
@@ -91,7 +91,7 @@ will be no community support and they might be removed at a later stage.
9191
As depicted below, after the release branch has been created the stabilization phase will begin. After finishing the release, a git tag will be created to point to `HEAD` of the release branch. Follow-up releases will be branched off from the git tag.
9292

9393
```console
94-
o---o---o---o---o master
94+
o---o---o---o---o main
9595
\
9696
\ v1.0.0 v1.0.1
9797
\ | |

NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The project maintains the following source code repositories:
3131
## Third-party Dependencies
3232

3333
This project leverages the following third party content.
34-
The corresponding license files can be found at <https://github.com/eclipse-iceoryx/iceoryx/tree/master/doc/3rd_party_licenses> or in the folder `share/doc/iceoryx/3rd_party_licenses` of your local iceoryx installation.
34+
The corresponding license files can be found at <https://github.com/eclipse-iceoryx/iceoryx/tree/main/doc/3rd_party_licenses> or in the folder `share/doc/iceoryx/3rd_party_licenses` of your local iceoryx installation.
3535

3636
### System Libraries
3737

QUALITY_DECLARATION.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Taking into account that iceoryx is integrated as a shared-memory transport laye
4141
### ABI Stability Within a Released ROS Distribution [1.v]/[1.vi]
4242

4343
iceoryx aims to be ABI/API-stable for MINOR and PATCH releases for maintaining ROS releases.
44-
For ROS integration are release branches with the same policies like the `master` branch maintained for long-term support.
44+
For ROS integration are release branches with the same policies like the `main` branch maintained for long-term support.
4545

4646
## Change Control Process [2]
4747

@@ -72,7 +72,7 @@ Check [Eclipse Developer Process](https://www.eclipse.org/projects/dev_process/)
7272
### Continuous Integration [2.iv]
7373

7474
Pull requests are required to pass all jobs in the CI system before merging even when it is approved.
75-
Additionally, the CI builds always the latest master branch to ensure functionality.
75+
Additionally, the CI builds always the latest main branch to ensure functionality.
7676

7777
The results of the CI are made public and cover x64 platforms running Linux, macOS, and Windows:
7878

@@ -120,7 +120,7 @@ A CI job ensures by checking with `ament_copyright` that all files comply with t
120120

121121
## Testing [4]
122122

123-
Every iceoryx package has a `test` folder that contains subfolders for [module- and/or integrationtests](./CONTRIBUTING.md#testing) written based on the Google test framework. All tests are running on the CI for every Pull-Request for all supported platforms and are contained in the master branch.
123+
Every iceoryx package has a `test` folder that contains subfolders for [module- and/or integrationtests](./CONTRIBUTING.md#testing) written based on the Google test framework. All tests are running on the CI for every Pull-Request for all supported platforms and are contained in the main branch.
124124
Currently, due to limited support on Windows, there are some exclusions for testing on the CI.
125125

126126
### Feature Testing [4.i]
@@ -141,7 +141,7 @@ The Eclipse iceoryx project use [gcov](https://gcc.gnu.org/onlinedocs/gcc/Gcov.h
141141
- Function Coverage
142142
- Branch Coverage
143143

144-
The coverage results of every Pull-Request and master branch are publicly available on [codecov.io](https://app.codecov.io/gh/eclipse-iceoryx/iceoryx).
144+
The coverage results of every Pull-Request and main branch are publicly available on [codecov.io](https://app.codecov.io/gh/eclipse-iceoryx/iceoryx).
145145
A detailed report (e.g. the coverage in different packages) can be obtained by following [this](./CONTRIBUTING.md#coverage-scan) guide.
146146

147147
### Performance [4.iv]

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[![Build & Test](https://github.com/eclipse-iceoryx/iceoryx/workflows/Build%20&%20Test/badge.svg?branch=master)](https://github.com/eclipse-iceoryx/iceoryx/actions)
2-
[![Integrationtests](https://github.com/eclipse-iceoryx/iceoryx/workflows/Iceoryx%20Integrationtests/badge.svg?branch=master)](https://github.com/eclipse-iceoryx/iceoryx/actions)
3-
[![Cirrus CI](https://img.shields.io/cirrus/github/eclipse-iceoryx/iceoryx/master?label=Cirrus%20CI)](https://cirrus-ci.com/github/eclipse-iceoryx/iceoryx)
1+
[![Build & Test](https://github.com/eclipse-iceoryx/iceoryx/workflows/Build%20&%20Test/badge.svg?branch=main)](https://github.com/eclipse-iceoryx/iceoryx/actions)
2+
[![Integrationtests](https://github.com/eclipse-iceoryx/iceoryx/workflows/Iceoryx%20Integrationtests/badge.svg?branch=main)](https://github.com/eclipse-iceoryx/iceoryx/actions)
3+
[![Cirrus CI](https://img.shields.io/cirrus/github/eclipse-iceoryx/iceoryx/main?label=Cirrus%20CI)](https://cirrus-ci.com/github/eclipse-iceoryx/iceoryx)
44
[![Gitter](https://badges.gitter.im/eclipse-iceoryx/iceoryx.svg)](https://gitter.im/eclipse/iceoryx)
55
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
6-
[![Codecov](https://codecov.io/gh/eclipse-iceoryx/iceoryx/branch/master/graph/badge.svg?branch=master)](https://codecov.io/gh/eclipse-iceoryx/iceoryx?branch=master)
7-
[![Sanitize](https://github.com/eclipse/iceoryx/workflows/Sanitize/badge.svg?branch=master)](https://github.com/eclipse/iceoryx/actions?query=workflow%3ASanitize)
6+
[![Codecov](https://codecov.io/gh/eclipse-iceoryx/iceoryx/branch/main/graph/badge.svg?branch=main)](https://codecov.io/gh/eclipse-iceoryx/iceoryx?branch=main)
7+
[![Sanitize](https://github.com/eclipse/iceoryx/workflows/Sanitize/badge.svg?branch=main)](https://github.com/eclipse/iceoryx/actions?query=workflow%3ASanitize)
88

99
<p align="center">
1010
<img src="https://user-images.githubusercontent.com/8661268/114321508-64a6b000-9b1b-11eb-95ef-b84c91387cff.png" width="50%">

doc/aspice_swe3_4/swe_docu_guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ For good examples on PlantUML checkout https://plantuml.com.
128128

129129
In iceoryx Pull-Requests are pdf files generated and uploaded to the Github artifact store.
130130

131-
If you want to download the pdf files from the Pull-Requests or master build you can do it by the following way:
131+
If you want to download the pdf files from the Pull-Requests or `main` build you can do it by the following way:
132132

133133
* Open the "Checks" view in the PR
134134
* Open the "Details" link for the check `iceoryx-coverage-doxygen-ubuntu` in `Test Coverage + Doxygen Documentation`

0 commit comments

Comments
 (0)