You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+3-3Lines changed: 3 additions & 3 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -55,7 +55,7 @@ Please make sure you have:
55
55
5. All commits have been signed with `git commit -s`
56
56
6. The `iceoryx-unreleased.md` in `doc/website/release-notes` is updated with the GitHub issue
57
57
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`
59
59
8. Link the pull request to the according GitHub issue and set the label accordingly
60
60
61
61
**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.
76
76
77
77
## Branching strategy
78
78
79
-
`master`
79
+
`main`
80
80
81
81
* Main development branch
82
82
* Open for external contributions
@@ -91,7 +91,7 @@ will be no community support and they might be removed at a later stage.
91
91
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.
Copy file name to clipboardExpand all lines: NOTICE.md
+1-1Lines changed: 1 addition & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -31,7 +31,7 @@ The project maintains the following source code repositories:
31
31
## Third-party Dependencies
32
32
33
33
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.
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.
76
76
77
77
The results of the CI are made public and cover x64 platforms running Linux, macOS, and Windows:
78
78
@@ -120,7 +120,7 @@ A CI job ensures by checking with `ament_copyright` that all files comply with t
120
120
121
121
## Testing [4]
122
122
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.
124
124
Currently, due to limited support on Windows, there are some exclusions for testing on the CI.
125
125
126
126
### Feature Testing [4.i]
@@ -141,7 +141,7 @@ The Eclipse iceoryx project use [gcov](https://gcc.gnu.org/onlinedocs/gcc/Gcov.h
141
141
- Function Coverage
142
142
- Branch Coverage
143
143
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).
145
145
A detailed report (e.g. the coverage in different packages) can be obtained by following [this](./CONTRIBUTING.md#coverage-scan) guide.
0 commit comments