release-please 13.19.2 → 13.19.5

package/CHANGELOG.md

@@ -4,6 +4,28 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [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)
+
+
+### Bug Fixes
+
+* stop iterating if we fail to receive commits from a graphql query ([#1518](https://github.com/googleapis/release-please/issues/1518)) ([0f27cb5](https://github.com/googleapis/release-please/commit/0f27cb58d5a21e95a4f1a6c3fcfff019cdfdaff9))
+
 ## [13.19.2](https://github.com/googleapis/release-please/compare/v13.19.1...v13.19.2) (2022-07-06)
 
 

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/github.js

@@ -488,64 +488,72 @@ class GitHub {
         }
     }
     async mergeCommitsGraphQL(targetBranch, cursor, options = {}) {
-        var _a;
+        var _a, _b;
         logger_1.logger.debug(`Fetching merge commits on branch ${targetBranch} with cursor: ${cursor}`);
-        const response = await this.graphqlRequest({
-            query: `query pullRequestsSince($owner: String!, $repo: String!, $num: Int!, $maxFilesChanged: Int, $targetBranch: String!, $cursor: String) {
-        repository(owner: $owner, name: $repo) {
-          ref(qualifiedName: $targetBranch) {
-            target {
-              ... on Commit {
-                history(first: $num, after: $cursor) {
-                  nodes {
-                    associatedPullRequests(first: 10) {
-                      nodes {
-                        number
-                        title
-                        baseRefName
-                        headRefName
-                        labels(first: 10) {
-                          nodes {
-                            name
-                          }
+        const query = `query pullRequestsSince($owner: String!, $repo: String!, $num: Int!, $maxFilesChanged: Int, $targetBranch: String!, $cursor: String) {
+      repository(owner: $owner, name: $repo) {
+        ref(qualifiedName: $targetBranch) {
+          target {
+            ... on Commit {
+              history(first: $num, after: $cursor) {
+                nodes {
+                  associatedPullRequests(first: 10) {
+                    nodes {
+                      number
+                      title
+                      baseRefName
+                      headRefName
+                      labels(first: 10) {
+                        nodes {
+                          name
                         }
-                        body
-                        mergeCommit {
-                          oid
+                      }
+                      body
+                      mergeCommit {
+                        oid
+                      }
+                      files(first: $maxFilesChanged) {
+                        nodes {
+                          path
                         }
-                        files(first: $maxFilesChanged) {
-                          nodes {
-                            path
-                          }
-                          pageInfo {
-                            endCursor
-                            hasNextPage
-                          }
+                        pageInfo {
+                          endCursor
+                          hasNextPage
                         }
                       }
                     }
-                    sha: oid
-                    message
-                  }
-                  pageInfo {
-                    hasNextPage
-                    endCursor
                   }
+                  sha: oid
+                  message
+                }
+                pageInfo {
+                  hasNextPage
+                  endCursor
                 }
               }
             }
           }
         }
-      }`,
+      }
+    }`;
+        const params = {
             cursor,
             owner: this.repository.owner,
             repo: this.repository.repo,
             num: 25,
             targetBranch,
             maxFilesChanged: 100, // max is 100
+        };
+        const response = await this.graphqlRequest({
+            query,
+            ...params,
         });
+        if (!response) {
+            logger_1.logger.warn(`Did not receive a response for query: ${query}`, params);
+            return null;
+        }
         // if the branch does exist, return null
-        if (!response.repository.ref) {
+        if (!((_a = response.repository) === null || _a === void 0 ? void 0 : _a.ref)) {
             logger_1.logger.warn(`Could not find commits for branch ${targetBranch} - it likely does not exist.`);
             return null;
         }
@@ -572,7 +580,7 @@ class GitHub {
                     labels: pullRequest.labels.nodes.map(node => node.name),
                     files,
                 };
-                if (((_a = pullRequest.files.pageInfo) === null || _a === void 0 ? void 0 : _a.hasNextPage) && options.backfillFiles) {
+                if (((_b = pullRequest.files.pageInfo) === null || _b === void 0 ? void 0 : _b.hasNextPage) && options.backfillFiles) {
                     logger_1.logger.info(`PR #${pullRequest.number} has many files, backfilling`);
                     commit.files = await this.getCommitFiles(graphCommit.sha);
                 }

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.2",
+  "version": "13.19.5",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",