From e0e70911b864bf9bf389ed5efe67abaaba794bc3 Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Fri, 9 Aug 2024 16:36:43 +0800 Subject: [PATCH] Remove reference to the `master` branch Plus, update references of other repositories to point to their respective `main` branch. - https://github.com/stylelint/stylelint - https://github.com/moodlehq/moodle-local_amos --- remote_branch_checker/remote_branch_checker.sh | 4 ++-- verify_commit_messages/amoslib.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/remote_branch_checker/remote_branch_checker.sh b/remote_branch_checker/remote_branch_checker.sh index ff66ff98..c155159a 100755 --- a/remote_branch_checker/remote_branch_checker.sh +++ b/remote_branch_checker/remote_branch_checker.sh @@ -85,7 +85,7 @@ ${mydir}/../git_garbage_collector/git_garbage_collector.sh # to connect to it using jenkins cli.. displayname="" if [[ -n "${BUILD_TAG}" ]] && [[ ! "${issue}" = "" ]] && [[ -n "${jenkinsserver}" ]]; then - if [[ "${integrateto}" = "master" ]] || [[ "${integrateto}" = "main" ]]; then + if [[ "${integrateto}" = "main" ]]; then displayname="#${BUILD_NUMBER}:${issue}" else if [[ ${integrateto} =~ ^MOODLE_([0-9]*)_STABLE$ ]]; then @@ -518,7 +518,7 @@ if [ -f $WORKSPACE/.stylelintrc ]; then then echo "Info: stylelint completed without errors." else - # https://github.com/stylelint/stylelint/blob/master/docs/user-guide/cli.md#exit-codes + # https://github.com/stylelint/stylelint/blob/main/docs/user-guide/cli.md#exit-codes stylelintcode=$? if [ $stylelintcode -eq 2 ]; then echo "Info: stylelint found errors in patchset." diff --git a/verify_commit_messages/amoslib.php b/verify_commit_messages/amoslib.php index 75e5971b..4f6f449c 100644 --- a/verify_commit_messages/amoslib.php +++ b/verify_commit_messages/amoslib.php @@ -30,7 +30,7 @@ function clean_param($param, $type) { } /** - * Parser for AMOS script, butchered from https://github.com/moodlehq/moodle-local_amos/blob/master/mlanglib.php + * Parser for AMOS script, butchered from https://github.com/moodlehq/moodle-local_amos/blob/main/mlanglib.php * This is an exact copy of execute() extract_script_from_text() and legacy_component_name() from that file, see the marker * below where copy/paste of code starts. The code above is to allow us copy and paste thos functions. */