Skip to content

Commit

Permalink
Merge branch 'release/2.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
noud-github committed Dec 2, 2021
2 parents 5d436cf + 2462b40 commit f2de82c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 6 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2327,6 +2327,9 @@ get-latest-pr-texts: {

## Release History

### 2.2.1
- FIXES a issue with `update-changelog-with-latest-pr-texts.js` selecting the todays date on a hotfix.

### 2.2
- Adds `update-package-changelog` Grunt task & config.
- Adds `extract-extra-pr-texts-from-yoast-cli-md` Grunt task & config.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@yoast/grunt-plugin-tasks",
"description": "Custom Yoast grunt tasks",
"version": "2.2.0",
"version": "2.2.1",
"homepage": "https://github.com/Yoast/",
"repository": {
"type": "git",
Expand Down
3 changes: 1 addition & 2 deletions tasks/update-changelog-with-latest-pr-texts.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,10 @@ module.exports = function( grunt ) {
} )
);

if ( ! versionNumber.patch === 0 || options.useTodayasReleaseDate ) {
if ( versionNumber.patch !== 0 || options.useTodayasReleaseDate ) {
useTodayasReleaseDate = true;
}


// Only if the current version is not in the changelog yet, and is not a patch, we remove old changelog entries.
if ( ! containsCurrentVersion && versionNumber.patch === 0 ) {
let cleanedChangelog = changelog;
Expand Down
2 changes: 1 addition & 1 deletion test/expected/changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### 16.0: September 7th, 2021
### 16.0: December 14th, 2021
Enhancements:
* test left over entry.

Expand Down
2 changes: 1 addition & 1 deletion test/expected/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ Your question has most likely been answered on our help center: [yoast.com/help/
== Changelog ==

= 16.0 =
Release Date: September 7th, 2021
Release Date: December 14th, 2021

Bugfixes:

Expand Down
2 changes: 1 addition & 1 deletion test/expected/readme4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ Your question has most likely been answered on our help center: [yoast.com/help/
== Changelog ==

= 16.7 =
Release Date: September 7th, 2021
Release Date: December 14th, 2021

Enhancements:

Expand Down

0 comments on commit f2de82c

Please sign in to comment.