Skip to content

Commit

Permalink
Adjust for renaming 'master' to 'main'
Browse files Browse the repository at this point in the history
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!
  • Loading branch information
LukasWoodtli authored and rettichschnidi committed Jan 30, 2024
1 parent 48af173 commit ec4609e
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: '**'
pull_request:
branches: [master]
branches: [main]
schedule:
- cron: '20 14 * * 1'

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion tools/ci/run_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ec4609e

Please sign in to comment.