Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ 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",
"Installing",
"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
}
Expand All @@ -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."
},
```
Expand All @@ -276,7 +276,7 @@ In this example:
Overwrite the readme if it already exists.

[--branch=<branch>]
Name of default branch of the underlying repository. Defaults to master.
Name of default branch of the underlying repository. Defaults to main.



Expand Down
4 changes: 2 additions & 2 deletions features/scaffold-package-readme.feature
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ 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:
"""
*This README.md is generated dynamically from the project's codebase
"""
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:
Expand Down
10 changes: 5 additions & 5 deletions src/ScaffoldPackageCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -188,15 +188,15 @@ 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",
* "Installing",
* "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
* }
Expand All @@ -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."
* },
* ```
Expand All @@ -234,7 +234,7 @@ public function package( $args, $assoc_args ) {
* : Overwrite the readme if it already exists.
*
* [--branch=<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
Expand All @@ -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/';
Expand Down
2 changes: 1 addition & 1 deletion templates/.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ notifications:

branches:
only:
- master
- main

cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion templates/composer.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
"dev-main": "2.x-dev"
},
"bundled": false,
"commands": [
Expand Down