Skip to content

Commit

Permalink
Merge pull request #308 from junpataleta/master2main
Browse files Browse the repository at this point in the history
Remove reference to the `master` branch
  • Loading branch information
HuongNV13 authored Oct 16, 2024
2 parents a99342b + e0e7091 commit 2dd4d47
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions remote_branch_checker/remote_branch_checker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down
2 changes: 1 addition & 1 deletion verify_commit_messages/amoslib.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down

0 comments on commit 2dd4d47

Please sign in to comment.