Skip to content

Commit fd951d1

Browse files
docs: homgenizing commit/branches/pull request prefix (#3737)
* docs: homogenizing prefixes * docs: improving table header * chore: adding changelog file 3737.documentation.md [dependabot-skip] --------- Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent e7d33f7 commit fd951d1

File tree

3 files changed

+88
-27
lines changed

3 files changed

+88
-27
lines changed

doc/changelog.d/3737.documentation.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
docs: homogenizing commit/branches/pull request prefix

doc/source/getting_started/develop_pymapdl.rst

Lines changed: 84 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -63,35 +63,46 @@ guidelines for developing code in a repository:
6363
#. **Use branches**: Create branches for different features, bug fixes, or
6464
experiments. This keeps changes isolated and facilitates parallel
6565
development. The CI/CD checks that the branch name is compliant. For example,
66-
the branch name must start with a prefix and a backslash.
66+
the branch name must start with a lower case prefix and a backslash.
6767
The allowed prefixes are:
6868

69-
- `fix/` - Bug fixes.
70-
- `feat/` - Changes that introduce a new feature or significant addition.
71-
- `maint/` - General maintenance of the repository. For instance, improving the CI/CD workflows.
69+
- `build/` - Changes that affect the build system or external dependencies (such as to ``pip`` or ``make``).
70+
- `ci/` - Changes to the CI/CD configuration files and scripts.
71+
- `dependabot/` - Created by Dependabot.
7272
- `docs/` - Improves documentation and examples.
73+
- `feat/` - Changes that introduce a new feature or significant addition.
74+
- `fix/` - Bug fixes.
75+
- `junk/` - Other purposes. It should not be used for branches that are going to be merged to ``main``.
76+
- `maint/` - General maintenance of the repository.
7377
- `no-ci/` - (Not applicable to PyMAPDL) In some repositories, branches with this prefix do not trigger CI/CD.
74-
- `test/` - Improvements or changes to testing.
75-
- `testing/` - For testing and debugging. It should not be used for branches that are going to be merged to ``main``.
78+
- `perf/` - A code change that improves performance.
79+
- `refactor/` - A code change that neither fixes a bug nor adds a feature.
7680
- `release/` - Contains the released versions changes.
77-
- `dependabot/` - Created by Dependabot.
78-
- `junk/` - Other purposes. It should not be used for branches that are going to be merged to ``main``.
81+
- `revert/` - Reverts a previous commit.
82+
- `testing/` - For testing and debugging. It can be used to add new tests.
83+
84+
**Note**: For more information, see `Table of allowed prefix <table_prefix_>`_.
7985

8086
#. **Write descriptive commit messages**: Provide clear and concise commit
8187
messages that explain the purpose and context of the changes. Follow a
8288
consistent style.
8389

84-
- `fix:` - Bug fixes.
85-
- `feat:` - Changes that introduce a new feature or significant addition.
86-
- `docs:` - Changes pertaining only to documentation.
87-
- `style:` - Changes that do not affect the meaning of the code (such as white space, formatting, and missing semicolons).
88-
- `refactor:` - A code change that neither fixes a bug nor adds a feature.
89-
- `perf:` - A code change that improves performance.
90-
- `test:` - Improvements or changes to testing.
9190
- `build:` - Changes that affect the build system or external dependencies (such as to ``pip`` or ``make``).
91+
- `chore:` - Other changes that don't modify the code. It can be used as a fall back general branch name.
9292
- `ci:` - Changes to the CI/CD configuration files and scripts.
93-
- `chore:` - Other changes that don't modify the code (such as releasing and versioning).
93+
- `docs:` - Improves documentation and examples.
94+
- `feat:` - Changes that introduce a new feature or significant addition.
95+
- `fix:` - Bug fixes.
96+
- `maint:` - General maintenance of the repository.
97+
- `no-ci:` - (Not applicable to PyMAPDL) In some repositories, branches with this prefix do not trigger CI/CD.
98+
- `perf:` - A code change that improves performance.
99+
- `refactor:` - A code change that neither fixes a bug nor adds a feature.
100+
- `release:` - Contains the released versions changes.
94101
- `revert:` - Reverts a previous commit.
102+
- `style:` - Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc).
103+
- `testing:` - For testing and debugging. It can be used to add new tests.
104+
105+
**Note**: For more information, see `Table of allowed prefix <table_prefix_>`_.
95106

96107
#. **Commit frequently**: Make small, meaningful commits frequently. Avoid
97108
making a large number of unrelated changes in a single commit.
@@ -105,17 +116,19 @@ guidelines for developing code in a repository:
105116
Pull requests must follow the same convention as the commit messages.
106117
The following prefixes are allowed in the pull request names:
107118

108-
- `fix:` - Bug fixes.
109-
- `feat:` - Changes that introduce a new feature or significant addition.
110-
- `docs:` - Changes pertaining only to documentation.
111-
- `style:` - Changes that do not affect the meaning of the code (such as white space, formatting, and missing semicolons).
112-
- `refactor:` - A code change that neither fixes a bug nor adds a feature.
113-
- `perf:` - A code change that improves performance.
114-
- `test:` - Improvements or changes to testing.
115119
- `build:` - Changes that affect the build system or external dependencies (such as to ``pip`` or ``make``).
116120
- `ci:` - Changes to the CI/CD configuration files and scripts.
117-
- `chore:` - Other changes that don't modify the code (such as releasing and versioning).
118-
- `revert:` - Reverts a previous pull request.
121+
- `docs:` - Improves documentation and examples.
122+
- `feat:` - Changes that introduce a new feature or significant addition.
123+
- `fix:` - Bug fixes.
124+
- `maint:` - General maintenance of the repository.
125+
- `no-ci:` - (Not applicable to PyMAPDL) In some repositories, branches with this prefix do not trigger CI/CD.
126+
- `perf:` - A code change that improves performance.
127+
- `refactor:` - A code change that neither fixes a bug nor adds a feature.
128+
- `revert:` - Reverts a previous commit.
129+
- `testing:` - For testing and debugging. It can be used to add new tests.
130+
131+
**Note**: For more information, see `Table of allowed prefix <table_prefix_>`_.
119132

120133
The pull requests can also be labeled for easier repository maintenance.
121134
The CI/CD automatically labels each pull request based on the pull requests prefix and
@@ -149,6 +162,52 @@ guidelines for developing code in a repository:
149162
By following these guidelines, you can ensure smooth and organized code
150163
development within a repository, fostering collaboration, code quality, and feature enhancement.
151164

165+
**Table of allowed prefix**
166+
167+
.. _table_prefix:
168+
169+
+-------------+-----------------------------+------------------------------+----------------------------------+
170+
| Prefix | Commit (``prefix:``) | Branch (``prefix/``) | Pull-request (``prefix:``) |
171+
+=============+=============================+==============================+==================================+
172+
| `build` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
173+
+-------------+-----------------------------+------------------------------+----------------------------------+
174+
| `dependabot`| |:x:| | |:white_check_mark:| | |:x:| |
175+
+-------------+-----------------------------+------------------------------+----------------------------------+
176+
| `chore` | |:white_check_mark:| | |:x:| | |:x:| |
177+
+-------------+-----------------------------+------------------------------+----------------------------------+
178+
| `ci` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
179+
+-------------+-----------------------------+------------------------------+----------------------------------+
180+
| `docs` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
181+
+-------------+-----------------------------+------------------------------+----------------------------------+
182+
| `feat` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
183+
+-------------+-----------------------------+------------------------------+----------------------------------+
184+
| `fix` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
185+
+-------------+-----------------------------+------------------------------+----------------------------------+
186+
| `junk` | |:x:| | |:white_check_mark:| | |:x:| |
187+
+-------------+-----------------------------+------------------------------+----------------------------------+
188+
| `maint` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
189+
+-------------+-----------------------------+------------------------------+----------------------------------+
190+
| `no-ci` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
191+
+-------------+-----------------------------+------------------------------+----------------------------------+
192+
| `perf` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
193+
+-------------+-----------------------------+------------------------------+----------------------------------+
194+
| `refactor` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
195+
+-------------+-----------------------------+------------------------------+----------------------------------+
196+
| `release` | |:white_check_mark:| | |:white_check_mark:| | |:white_check_mark:| |
197+
+-------------+-----------------------------+------------------------------+----------------------------------+
198+
| `revert` | |:white_check_mark:| | |:white_check_mark:| | |:x:| |
199+
+-------------+-----------------------------+------------------------------+----------------------------------+
200+
| `style` | |:white_check_mark:| | |:x:| | |:x:| |
201+
+-------------+-----------------------------+------------------------------+----------------------------------+
202+
| `testing` | |:white_check_mark:| | |:white_check_mark:| | |:x:| |
203+
+-------------+-----------------------------+------------------------------+----------------------------------+
204+
205+
206+
Where:
207+
208+
* |:white_check_mark:| means that the prefix is allowed.
209+
* |:x:| means that the prefix is not allowed.
210+
152211

153212
.. _ref_unit_testing_contributing:
154213

doc/styles/config/vocabularies/ANSYS/accept.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ datas
5858
delet
5959
Dependabot
6060
Dev
61-
Dimitris
6261
devcontainer
6362
DevContainer
63+
Dimitris
6464
dof
6565
ect
6666
eigenfrequency
@@ -88,9 +88,9 @@ hexahedral
8888
hostname
8989
HTML
9090
Image[Mm]agick
91-
Ioannis
9291
imagin
9392
importlib
93+
Ioannis
9494
ist
9595
Julia
9696
Kalogeris
@@ -103,6 +103,7 @@ levl
103103
Linder
104104
Linux
105105
MacOS
106+
maint
106107
mapdl
107108
MAPDL
108109
mater

0 commit comments

Comments
 (0)