diff --git a/README.md b/README.md index a0aa170..196d925 100644 --- a/README.md +++ b/README.md @@ -230,7 +230,7 @@ composer.json includes: ], "readme": { "shields": [ - "[![Build Status](https://travis-ci.org/runcommand/reset-password.svg?branch=master)](https://travis-ci.org/runcommand/reset-password)" + "[![Build Status](https://travis-ci.org/runcommand/reset-password.svg?branch=main)](https://travis-ci.org/runcommand/reset-password)" ], "sections": [ "Using", @@ -238,7 +238,7 @@ composer.json includes: "Support" ], "support": { - "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/master/bin/readme-partials/support-open-source.md" + "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/main/bin/readme-partials/support-open-source.md" }, "show_powered_by": false } @@ -257,7 +257,7 @@ For sections, "pre", "body" and "post" are supported. Example: ``` "support": { "pre": "highlight.md", - "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/master/bin/readme-partials/support-open-source.md", + "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/main/bin/readme-partials/support-open-source.md", "post": "This is additional text to show after main body content." }, ``` @@ -276,7 +276,7 @@ In this example: Overwrite the readme if it already exists. [--branch=] - Name of default branch of the underlying repository. Defaults to master. + Name of default branch of the underlying repository. Defaults to main. diff --git a/features/scaffold-package-readme.feature b/features/scaffold-package-readme.feature index 4b64bab..635484c 100644 --- a/features/scaffold-package-readme.feature +++ b/features/scaffold-package-readme.feature @@ -44,7 +44,7 @@ Feature: Scaffold a README.md file for an existing package """ And the {PACKAGE_PATH}/local/wp-cli/default-readme/README.md file should contain: """ - [![Build Status](https://travis-ci.org/wp-cli/default-readme.svg?branch=master) + [![Build Status](https://travis-ci.org/wp-cli/default-readme.svg?branch=main) """ And the {PACKAGE_PATH}/local/wp-cli/default-readme/README.md file should contain: """ @@ -52,7 +52,7 @@ Feature: Scaffold a README.md file for an existing package """ And the {PACKAGE_PATH}/local/wp-cli/default-readme/README.md file should contain: """ - wp package install wp-cli/default-readme:dev-master + wp package install wp-cli/default-readme:dev-main """ When I run `wp package uninstall wp-cli/default-readme` Then STDOUT should contain: diff --git a/src/ScaffoldPackageCommand.php b/src/ScaffoldPackageCommand.php index 8f1f2a7..8061ec2 100644 --- a/src/ScaffoldPackageCommand.php +++ b/src/ScaffoldPackageCommand.php @@ -188,7 +188,7 @@ public function package( $args, $assoc_args ) { * ], * "readme": { * "shields": [ - * "[![Build Status](https://travis-ci.org/runcommand/reset-password.svg?branch=master)](https://travis-ci.org/runcommand/reset-password)" + * "[![Build Status](https://travis-ci.org/runcommand/reset-password.svg?branch=main)](https://travis-ci.org/runcommand/reset-password)" * ], * "sections": [ * "Using", @@ -196,7 +196,7 @@ public function package( $args, $assoc_args ) { * "Support" * ], * "support": { - * "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/master/bin/readme-partials/support-open-source.md" + * "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/main/bin/readme-partials/support-open-source.md" * }, * "show_powered_by": false * } @@ -215,7 +215,7 @@ public function package( $args, $assoc_args ) { * ``` * "support": { * "pre": "highlight.md", - * "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/master/bin/readme-partials/support-open-source.md", + * "body": "https://raw.githubusercontent.com/runcommand/runcommand-theme/main/bin/readme-partials/support-open-source.md", * "post": "This is additional text to show after main body content." * }, * ``` @@ -234,7 +234,7 @@ public function package( $args, $assoc_args ) { * : Overwrite the readme if it already exists. * * [--branch=] - * : Name of default branch of the underlying repository. Defaults to master. + * : Name of default branch of the underlying repository. Defaults to main. * * @when before_wp_load * @subcommand package-readme @@ -254,7 +254,7 @@ public function package_readme( $args, $assoc_args ) { } $force = Utils\get_flag_value( $assoc_args, 'force' ); - $branch = Utils\get_flag_value( $assoc_args, 'branch', 'master' ); + $branch = Utils\get_flag_value( $assoc_args, 'branch', 'main' ); $package_root = dirname( __DIR__ ); $template_path = $package_root . '/templates/'; diff --git a/templates/.travis.yml b/templates/.travis.yml index 45dc083..f89a39a 100644 --- a/templates/.travis.yml +++ b/templates/.travis.yml @@ -14,7 +14,7 @@ notifications: branches: only: - - master + - main cache: directories: diff --git a/templates/composer.mustache b/templates/composer.mustache index be307a7..0e61447 100644 --- a/templates/composer.mustache +++ b/templates/composer.mustache @@ -21,7 +21,7 @@ }, "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-main": "2.x-dev" }, "bundled": false, "commands": [