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 #2225

Merged
merged 4 commits into from
Feb 2, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac31666
feat(ci): add epic/* release workflow and rename `master` to `trunk`
dkoo Feb 1, 2024
cdcfbab
fix: track renamed file and add epic job
dkoo Feb 1, 2024
20efdfb
feat: add hotfix and epic release jobs
dkoo Feb 1, 2024
a994223
fix: revert unintended change
dkoo Feb 2, 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 @@ -75,6 +75,7 @@ workflows:
- release
- alpha
- /^hotfix\/.*/
- /^epic\/.*/
- post_release:
requires:
- release
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Feature requests can be [submitted to our issue tracker](https://github.com/Auto

## Pull requests

To submit a patch to the Newspack theme, simply create a pull request to the master branch of the Newspack theme repository. Please test and provide an explanation for your changes. When opening a pull request, please follow these guidelines:
To submit a patch to the Newspack theme, simply create a pull request to the trunk branch of the Newspack theme repository. Please test and provide an explanation for your changes. When opening a pull request, please follow these guidelines:

- **Ensure you stick to the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/) and the [VIP Go Coding Standards](https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/)**
- Install our pre-commit hook using composer. It'll help with the coding standards by automatically checking code when you commit. To install them run `composer install` from the command line within the Newspack plugin or theme directory.
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### All Submissions:

* [ ] Have you followed the [Newspack Contributing guideline](https://github.com/Automattic/newspack-theme/blob/master/.github/CONTRIBUTING.md)?
* [ ] Have you followed the [Newspack Contributing guideline](https://github.com/Automattic/newspack-theme/blob/trunk/.github/CONTRIBUTING.md)?
* [ ] Does your code follow the [WordPress' coding standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/) and [VIP Go coding standards](https://vip.wordpress.com/documentation/vip-go/code-review-blockers-warnings-notices/)?
* [ ] Have you checked to ensure there aren't other open [Pull Requests](../../pulls) for the same update/change?

Expand Down
4 changes: 2 additions & 2 deletions .hooks/pre-push
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

branch=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')

if [[ "$branch" = "master" ]]; then
echo "Error: pushing directly to the master branch is prohibited"
if [[ "$branch" = "trunk" ]]; then
echo "Error: pushing directly to the trunk branch is prohibited"
exit 1
fi
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To disclose a security issue to our team, [please submit a report via HackerOne

## Contributing to Newspack

If you have a patch or have stumbled upon an issue with the Newspack plugin/theme, you can contribute this back to the code. [Please read our contributor guidelines for more information on how you can do this.](https://github.com/Automattic/newspack-theme/blob/master/.github/CONTRIBUTING.md)
If you have a patch or have stumbled upon an issue with the Newspack plugin/theme, you can contribute this back to the code. [Please read our contributor guidelines for more information on how you can do this.](https://github.com/Automattic/newspack-theme/blob/trunk/.github/CONTRIBUTING.md)

### Development

Expand All @@ -28,10 +28,10 @@ The Newspack theme repository contains the Newspack parent theme in a subdirecto

## Support or Questions

This repository is not suitable for support or general questions about Newspack. Please only use our issue trackers for bug reports and feature requests, following [the contribution guidelines](https://github.com/Automattic/newspack-theme/blob/master/.github/CONTRIBUTING.md).
This repository is not suitable for support or general questions about Newspack. Please only use our issue trackers for bug reports and feature requests, following [the contribution guidelines](https://github.com/Automattic/newspack-theme/blob/trunk/.github/CONTRIBUTING.md).

Support requests in issues on this repository will be closed on sight.

## License

Newspack is licensed under [GNU General Public License v2 (or later)](https://github.com/Automattic/newspack-theme/blob/master/LICENSE).
Newspack is licensed under [GNU General Public License v2 (or later)](https://github.com/Automattic/newspack-theme/blob/trunk/LICENSE).
4 changes: 2 additions & 2 deletions newspack-theme/sass/blocks/_blocks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:meta';
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';
@use '../variables-site/structure';

Expand Down Expand Up @@ -823,7 +823,7 @@ p.has-background {
padding-left: 0;
}

@include mixins-master.nestedSubMenuPadding();
@include mixins-main.nestedSubMenuPadding();
}

.widget .wp-block-categories li {
Expand Down
8 changes: 4 additions & 4 deletions newspack-theme/sass/blocks/_patterns.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';

.newspack-pattern {
Expand Down Expand Up @@ -134,7 +134,7 @@
font-size: 0.8em;
}

@include mixins-master.jetpack-mailchimp;
@include mixins-main.jetpack-mailchimp;

&.has-background {
padding: 0;
Expand Down Expand Up @@ -196,7 +196,7 @@
font-size: 0.8em;
}

@include mixins-master.jetpack-mailchimp;
@include mixins-main.jetpack-mailchimp;

&.has-background {
padding: 32px;
Expand Down Expand Up @@ -232,7 +232,7 @@
max-width: 90vw;
width: 1200px;

@include mixins-master.jetpack-mailchimp( $gap: 0, $notification-margin: 8px 0 0 );
@include mixins-main.jetpack-mailchimp( $gap: 0, $notification-margin: 8px 0 0 );

/* stylelint-disable-next-line */
#wp-block-jetpack-mailchimp_consent-text {
Expand Down
0 ...ack-theme/sass/mixins/_mixins-master.scss → newspack-theme/sass/mixins/_mixins-main.scss
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions newspack-theme/sass/modules/_accessibility.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';

/* Text meant only for screen readers. */
.screen-reader-text {
Expand All @@ -21,7 +21,7 @@
clip-path: none;
color: var( --newspack-theme-color-text-screen );
display: block;
@include mixins-master.font-size( 0.875 );
@include mixins-main.font-size( 0.875 );

font-weight: bold;
height: auto;
Expand Down
4 changes: 2 additions & 2 deletions newspack-theme/sass/modules/_alignments.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';
@use '../variables-site/structure';

Expand Down Expand Up @@ -28,5 +28,5 @@

.aligncenter {
clear: both;
@include mixins-master.center-block;
@include mixins-main.center-block;
}
6 changes: 3 additions & 3 deletions newspack-theme/sass/modules/_clearings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';

.clear::before,
.clear::after,
Expand All @@ -12,7 +12,7 @@
.site-content::after,
.site-footer::before,
.site-footer::after {
@include mixins-master.clearfix;
@include mixins-main.clearfix;
}

.clear::after,
Expand All @@ -21,5 +21,5 @@
.site-header::after,
.site-content::after,
.site-footer::after {
@include mixins-master.clearfix-after;
@include mixins-main.clearfix-after;
}
2 changes: 1 addition & 1 deletion newspack-theme/sass/plugins/newspack-ads.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '../variables-site/variables-site';
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';
@use '../variables-site/structure';

Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/plugins/newspack-sponsors-editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '../variables-site/variables-site';
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../variables-site/structure';

// Newspack Blocks
Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/plugins/newspack-sponsors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '../variables-site/variables-site';
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';
@use '../variables-site/structure';

Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/plugins/the-events-calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// CSS file is generated in /tribe-events/tribe-events.css
// See: https://theeventscalendar.com/knowledgebase/k/customizing-css/

@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';
@use '../variables-site/structure';

Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/plugins/trust-indicators.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use '../variables-site/variables-site';
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';
@use '../variables-site/structure';

Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/plugins/woocommerce.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Sass variables
*/
@use '../variables-site/variables-site';
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';
@use '../variables-site/structure';

Expand Down
4 changes: 2 additions & 2 deletions newspack-theme/sass/site/primary/_comments.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:math';
@use '../../mixins/mixins-master';
@use '../../mixins/mixins-main';
@use '../../mixins/utilities';
@use '../../variables-site/structure';

Expand Down Expand Up @@ -341,7 +341,7 @@
}

.discussion-avatar-list {
@include mixins-master.clearfix;
@include mixins-main.clearfix;

margin: 0;
padding: 0;
Expand Down
6 changes: 3 additions & 3 deletions newspack-theme/sass/site/secondary/_widgets.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '../../mixins/mixins-master';
@use '../../mixins/mixins-main';
@use '../../mixins/utilities';
@use '../../variables-site/structure';

Expand Down Expand Up @@ -163,8 +163,8 @@

li {
&::after {
@include mixins-master.clearfix;
@include mixins-master.clearfix-after;
@include mixins-main.clearfix;
@include mixins-main.clearfix-after;
}

&:not( :last-child ) {
Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/style-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Mixins */
@use 'mixins/mixins-master';
@use 'mixins/mixins-main';

/* Normalize */

Expand Down
10 changes: 5 additions & 5 deletions newspack-theme/sass/style-editor-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** === Includes === */

@use 'mixins/mixins-master';
@use 'mixins/mixins-main';
@use 'mixins/utilities';
@use 'variables-site/colors';
@use 'variables-site/fonts';
Expand Down Expand Up @@ -832,7 +832,7 @@ ul.wp-block-archives,
.wp-block-categories {
ul {
padding-top: ( 0.75 * structure.$size__spacing-unit );
@include mixins-master.nestedSubMenuPadding();
@include mixins-main.nestedSubMenuPadding();
}

li ul {
Expand Down Expand Up @@ -1216,7 +1216,7 @@ ul.wp-block-archives,
}

&.subscribe__style-8 {
@include mixins-master.jetpack-mailchimp-editor;
@include mixins-main.jetpack-mailchimp-editor;

.block-editor-block-list__layout[class*='is-size-'] & {
margin-left: -32px;
Expand Down Expand Up @@ -1280,7 +1280,7 @@ ul.wp-block-archives,
}

&.subscribe__style-9 {
@include mixins-master.jetpack-mailchimp-editor;
@include mixins-main.jetpack-mailchimp-editor;

.wp-block-columns {
margin: 0;
Expand Down Expand Up @@ -1324,7 +1324,7 @@ ul.wp-block-archives,
}

&.subscribe__style-10 {
@include mixins-master.jetpack-mailchimp-editor( $gap: 0 );
@include mixins-main.jetpack-mailchimp-editor( $gap: 0 );

.wp-block-jetpack-mailchimp > p {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/style-editor-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/** === Includes === */

@use 'variables-site/variables-site';
@use 'mixins/mixins-master';
@use 'mixins/mixins-main';
@use 'mixins/utilities';
@use 'variables-site/structure';

Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/typography/_headings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';

.comment-metadata,
Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/typography/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use 'sass:meta';
@use '../mixins/mixins-master';
@use '../mixins/mixins-main';
@use '../mixins/utilities';

html {
Expand Down
Loading