Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(ci): add epic/* release workflow and rename master to trunk #170

Merged
merged 2 commits into from
Feb 1, 2024
Merged

feat(ci): add epic/* release workflow and rename master to trunk #170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3052a11
feat(ci): add epic/* release workflow and rename `master` to `trunk`
dkoo Feb 1, 2024
42c3f85
fix: missed instance of legacy branch name
dkoo Feb 1, 2024
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
1 change: 1 addition & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ workflows:
- release
- alpha
- /^hotfix\/.*/
- /^epic\/.*/
- post_release:
requires:
- release_github
Expand Down
18 changes: 9 additions & 9 deletions blocks/scaip-sidebar/block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
( function( wp ) {
/**
* Registers a new block provided a unique name and an object defining its behavior.
* @see https://github.com/WordPress/gutenberg/tree/master/blocks#api
* @see https://github.com/WordPress/gutenberg/tree/trunk/blocks#api
*/
var registerBlockType = wp.blocks.registerBlockType;
/**
* Returns a new element of given type. Element is an abstraction layer atop React.
* @see https://github.com/WordPress/gutenberg/tree/master/element#element
* @see https://github.com/WordPress/gutenberg/tree/trunk/element#element
*/
var el = wp.element.createElement;
/**
* Retrieves the translation of text.
* @see https://github.com/WordPress/gutenberg/tree/master/i18n#api
* @see https://github.com/WordPress/gutenberg/tree/trunk/i18n#api
*/
var __ = wp.i18n.__;
/**
* Placeholder element
* @link https://github.com/WordPress/gutenberg/tree/master/packages/components/src/placeholder
* @link https://github.com/WordPress/gutenberg/tree/trunk/packages/components/src/placeholder
*/
var Placeholder = wp.components.Placeholder;
/**
* Dropdown <select> element
* @link https://github.com/WordPress/gutenberg/tree/master/packages/components/src/select-control
* @link https://github.com/WordPress/gutenberg/tree/trunk/packages/components/src/select-control
*/
var SelectControl = wp.components.SelectControl;
/**
* Notice element
* @link https://github.com/WordPress/gutenberg/tree/master/packages/components/src/notice
* @link https://github.com/WordPress/gutenberg/tree/trunk/packages/components/src/notice
*/
var Notice = wp.components.Notice;
/**
* External Link element
* @link https://github.com/WordPress/gutenberg/tree/master/packages/components/src/external-link
* @link https://github.com/WordPress/gutenberg/tree/trunk/packages/components/src/external-link
*/
var ExternalLink = wp.components.ExternalLink;
/**
* Literally just for a fancy dashicon
* @see https://github.com/WordPress/gutenberg/blob/master/packages/components/src/dashicon/README.md
* @see https://github.com/WordPress/gutenberg/blob/trunk/packages/components/src/dashicon/README.md
*/
var dashicon = wp.components.Dashicon;
/**
Expand Down Expand Up @@ -136,7 +136,7 @@
el(
ExternalLink,
{
href: 'https://github.com/Automattic/super-cool-ad-inserter-plugin/blob/master/docs/configuration.md'
href: 'https://github.com/Automattic/super-cool-ad-inserter-plugin/blob/trunk/docs/configuration.md'
},
'View the documentation.'
)
Expand Down
2 changes: 1 addition & 1 deletion docs/installation-and-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installation

1. [Download this plugin](https://github.com/Automattic/super-cool-adinserter-plugin/archive/master.zip) and save it to your WordPress installation's `wp-content/plugins/` directory in a folder named `super-cool-ad-inserter-plugin`
1. [Download this plugin](https://github.com/Automattic/super-cool-adinserter-plugin/archive/trunk.zip) and save it to your WordPress installation's `wp-content/plugins/` directory in a folder named `super-cool-ad-inserter-plugin`
2. Follow the [manual plugin installation instructions](https://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation) in the WordPress documentation to activate the plugin.
3. [Configure the plugin](./configuration.md).
2 changes: 1 addition & 1 deletion inc/scaip-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function scaip_admin_page() {
'<p>%1$s</p>',
sprintf(
__( 'For more information about these settings, and about the Super Cool Ad Inserter Plugin in general, <a href="%1$s">see the plugin\'s documentation on GitHub</a>.', 'scaip' ),
'https://github.com/Automattic/super-cool-adinserter-plugin/tree/master/docs'
'https://github.com/Automattic/super-cool-adinserter-plugin/tree/trunk/docs'
)
);
?>
Expand Down
Loading