From ec4609e0d796ace2f15191d3a48edbd527b568c3 Mon Sep 17 00:00:00 2001 From: Lukas Woodtli Date: Tue, 30 Jan 2024 16:51:05 +0100 Subject: [PATCH] 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! --- .github/workflows/codeql-analysis.yml | 2 +- README.md | 4 ++-- SECURITY.md | 2 +- tools/ci/run_ci.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1024cf5..dfe50ee 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -4,7 +4,7 @@ on: push: branches: '**' pull_request: - branches: [master] + branches: [main] schedule: - cron: '20 14 * * 1' diff --git a/README.md b/README.md index c9da5c8..1207d5c 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/SECURITY.md b/SECURITY.md index 1a6d080..78bbbe4 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -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. diff --git a/tools/ci/run_ci.sh b/tools/ci/run_ci.sh index f285068..56be772 100755 --- a/tools/ci/run_ci.sh +++ b/tools/ci/run_ci.sh @@ -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"