release-please 13.19.3 → 13.19.6

package/CHANGELOG.md

@@ -4,6 +4,28 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [13.19.6](https://github.com/googleapis/release-please/compare/v13.19.5...v13.19.6) (2022-07-27)
+
+
+### Bug Fixes
+
+* skip component when manifest release does not include component ([#1537](https://github.com/googleapis/release-please/issues/1537)) ([8f1a3a8](https://github.com/googleapis/release-please/commit/8f1a3a84a7abc81c47d8cac9295e58bc37cc92c5)), closes [#1536](https://github.com/googleapis/release-please/issues/1536)
+
+## [13.19.5](https://github.com/googleapis/release-please/compare/v13.19.4...v13.19.5) (2022-07-26)
+
+
+### Bug Fixes
+
+* **dart:** add multiline flag to replace regex ([#1524](https://github.com/googleapis/release-please/issues/1524)) ([fd7b73b](https://github.com/googleapis/release-please/commit/fd7b73b8f9288dbfa84f37a6ce2e77f6c1b49db8)), closes [#1523](https://github.com/googleapis/release-please/issues/1523)
+
+## [13.19.4](https://github.com/googleapis/release-please/compare/v13.19.3...v13.19.4) (2022-07-25)
+
+
+### Bug Fixes
+
+* **commits:** remove content before and after BREAKING in body ([#1531](https://github.com/googleapis/release-please/issues/1531)) ([f75e49f](https://github.com/googleapis/release-please/commit/f75e49f6b751347456746d9c4068191d340c8e1e))
+* **python:** make` __init__.py` bump underscore / hyphen agnostic ([4b25a47](https://github.com/googleapis/release-please/commit/4b25a475d53fd4f2eadd14619f701e51275f8e62))
+
 ## [13.19.3](https://github.com/googleapis/release-please/compare/v13.19.2...v13.19.3) (2022-07-08)
 
 

package/build/src/commit.js

@@ -92,6 +92,7 @@ function toConventionalChangelogFormat(ast) {
         text: '', // "text" will be populated if a BREAKING CHANGE token is parsed.
     };
     visitWithAncestors(ast, ['breaking-change'], (node, ancestors) => {
+        let hitBreakingMarker = false;
         let parent = ancestors.pop();
         if (!parent) {
             return;
@@ -104,7 +105,13 @@ function toConventionalChangelogFormat(ast) {
                 breaking.text = '';
                 // We treat text from the BREAKING CHANGE marker forward as
                 // the breaking change notes:
-                visit(parent, ['text', 'newline'], (node) => {
+                visit(parent, ['breaking-change', 'text', 'newline'], (node) => {
+                    if (node.type === 'breaking-change') {
+                        hitBreakingMarker = true;
+                        return;
+                    }
+                    if (!hitBreakingMarker)
+                        return;
                     breaking.text += node.value;
                 });
                 break;

package/build/src/strategies/base.js

@@ -289,11 +289,17 @@ class BaseStrategy {
             releaseData = pullRequestBody.releaseData[0];
         }
         else {
-            // manifest release with multiple components
-            releaseData = pullRequestBody.releaseData.find(releaseData => {
-                return (this.normalizeComponent(releaseData.component) ===
+            // manifest release with multiple components - find the release notes
+            // for the component to see if it was included in this release (parsed
+            // from the release pull request body)
+            releaseData = pullRequestBody.releaseData.find(datum => {
+                return (this.normalizeComponent(datum.component) ===
                     this.normalizeComponent(component));
             });
+            if (!releaseData && pullRequestBody.releaseData.length > 0) {
+                logger_1.logger.info(`Pull request contains releases, but not for component: ${component}`);
+                return;
+            }
         }
         const notes = releaseData === null || releaseData === void 0 ? void 0 : releaseData.notes;
         if (notes === undefined) {

package/build/src/strategies/python.js

@@ -90,20 +90,16 @@ class Python extends base_1.BaseStrategy {
             logger_1.logger.warn('No project/component found.');
         }
         else {
-            updates.push({
-                path: this.addPath(`${projectName}/__init__.py`),
+            [projectName, projectName.replace(/-/g, '_')]
+                .flatMap(packageName => [
+                `${packageName}/__init__.py`,
+                `src/${packageName}/__init__.py`,
+            ])
+                .forEach(packagePath => updates.push({
+                path: this.addPath(packagePath),
                 createIfMissing: false,
-                updater: new python_file_with_version_1.PythonFileWithVersion({
-                    version,
-                }),
-            });
-            updates.push({
-                path: this.addPath(`src/${projectName}/__init__.py`),
-                createIfMissing: false,
-                updater: new python_file_with_version_1.PythonFileWithVersion({
-                    version,
-                }),
-            });
+                updater: new python_file_with_version_1.PythonFileWithVersion({ version }),
+            }));
         }
         // There should be only one version.py, but foreach in case that is incorrect
         const versionPyFilesSearch = this.github.findFilesByFilenameAndRef('version.py', this.targetBranch, this.path);

package/build/src/updaters/dart/pubspec-yaml.js

@@ -26,19 +26,24 @@ class PubspecYaml extends default_1.DefaultUpdater {
      * @returns {string} The updated content
      */
     updateContent(content) {
-        const oldVersion = content.match(/version: ([0-9.]+)\+?([0-9]*$)/);
+        const oldVersion = content.match(/^version: ([0-9.]+)\+?(.*$)/m);
         let buildNumber = '';
         if (oldVersion) {
-            buildNumber = `${oldVersion[2]}`;
-            if (buildNumber.length > 0) {
+            buildNumber = oldVersion[2];
+            const parsedBuild = parseInt(buildNumber);
+            if (!isNaN(parsedBuild)) {
+                buildNumber = `+${parsedBuild + 1}`;
+                logger_1.logger.info(`updating from ${oldVersion[1]}+${oldVersion[2]} to ${this.version}${buildNumber}`);
+            }
+            else if (buildNumber.length > 0) {
                 buildNumber = `+${buildNumber}`;
-                logger_1.logger.info(`updating from ${oldVersion[1]}${buildNumber} to ${this.version}${buildNumber}`);
+                logger_1.logger.info(`updating from ${oldVersion[1]}+${oldVersion[2]} to ${this.version}${buildNumber}`);
             }
             else {
                 logger_1.logger.info(`updating from ${oldVersion[1]} to ${this.version}`);
             }
         }
-        return content.replace(/version: ([0-9.]+)\+?([0-9]*$)/, `version: ${this.version}${buildNumber}`);
+        return content.replace(/^version: .*$/m, `version: ${this.version}${buildNumber}`);
     }
 }
 exports.PubspecYaml = PubspecYaml;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "13.19.3",
+  "version": "13.19.6",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",