Adjust for renaming 'master' to 'main'

The 'master' branch was renamed to 'main' to reduce the use of harmful
language. Therefore, some scripts and descriptions were adjusted to the
new name of the default branch.
Words matter!
This commit is contained in:
Lukas Woodtli 2024-01-30 16:51:05 +01:00 committed by Reto Schneider
parent 48af173787
commit ec4609e0d7
4 changed files with 5 additions and 5 deletions

View File

@ -4,7 +4,7 @@ on:
push:
branches: '**'
pull_request:
branches: [master]
branches: [main]
schedule:
- cron: '20 14 * * 1'

View File

@ -10,7 +10,7 @@ Developers mailing list: https://dev.eclipse.org/mailman/listinfo/wakaama-dev
The only official release of Wakaama, version 1.0, is affected by various
security issues ([CVE-2019-9004], [CVE-2021-41040]).
Please use the most recent commit in the master branch. Release 1.0 is not
Please use the most recent commit in the main branch. Release 1.0 is not
supported anymore.
[CVE-2019-9004]: https://www.cve.org/CVERecord?id=CVE-2019-9004
@ -128,7 +128,7 @@ characters per line.
To check if your code matches the expected style, the following commands are helpful:
- `git clang-format-14 --diff`: Show what needs to be changed to match the expected code style
- `git clang-format-14`: Apply all needed changes directly
- `git clang-format-14 --commit master`: Fix code style for all changes since master
- `git clang-format-14 --commit main`: Fix code style for all changes since main
If existing code gets reformatted, this must be done in a separate commit. Its commit id has to be added to the file
`.git-blame-ignore-revs` and committed in yet another commit.

View File

@ -12,5 +12,5 @@ For more details, please look at https://www.eclipse.org/security/.
None
Please use the most recent commit in the master branch. Release 1.0 is not
Please use the most recent commit in the main branch. Release 1.0 is not
supported anymore.

View File

@ -21,7 +21,7 @@ readonly SCRIPT_NAME="$(basename "$0")"
CMAKE_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
OPT_BRANCH_SOURCE=
OPT_BRANCH_TARGET=master
OPT_BRANCH_TARGET=main
OPT_C_EXTENSIONS=""
OPT_C_STANDARD=""
OPT_CLANG_FORMAT="clang-format-14"