release-please 13.16.4 → 13.16.5

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.16.5](https://github.com/googleapis/release-please/compare/v13.16.4...v13.16.5) (2022-05-18)
+
+
+### Bug Fixes
+
+* all release tag matching if includeComponentInTag is false ([#1442](https://github.com/googleapis/release-please/issues/1442)) ([82a7c71](https://github.com/googleapis/release-please/commit/82a7c7186cf7c30530ce179b42b439400c539b52))
+
 ### [13.16.4](https://github.com/googleapis/release-please/compare/v13.16.3...v13.16.4) (2022-05-17)
 
 

package/build/src/manifest.js

@@ -147,7 +147,7 @@ class Manifest {
         });
         const component = await strategy.getBranchComponent();
         const releasedVersions = {};
-        const latestVersion = await latestReleaseVersion(github, targetBranch, version => isPublishedVersion(strategy, version), component, config.pullRequestTitlePattern);
+        const latestVersion = await latestReleaseVersion(github, targetBranch, version => isPublishedVersion(strategy, version), config, component);
         if (latestVersion) {
             releasedVersions[path] = latestVersion;
         }
@@ -840,7 +840,7 @@ function isPublishedVersion(strategy, version) {
  * @param {string} prefix Limit the release to a specific component.
  * @param pullRequestTitlePattern Configured PR title pattern.
  */
-async function latestReleaseVersion(github, targetBranch, releaseFilter, prefix, pullRequestTitlePattern) {
+async function latestReleaseVersion(github, targetBranch, releaseFilter, config, prefix) {
     const branchPrefix = prefix
         ? prefix.endsWith('-')
             ? prefix.replace(/-$/, '')
@@ -870,7 +870,7 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, prefix,
         if (branchName.getComponent() !== branchPrefix) {
             continue;
         }
-        const pullRequestTitle = pull_request_title_1.PullRequestTitle.parse(mergedPullRequest.title, pullRequestTitlePattern);
+        const pullRequestTitle = pull_request_title_1.PullRequestTitle.parse(mergedPullRequest.title, config.pullRequestTitlePattern);
         if (!pullRequestTitle) {
             continue;
         }
@@ -889,7 +889,7 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, prefix,
         if (!tagName) {
             continue;
         }
-        if (tagName.component === branchPrefix) {
+        if (tagMatchesConfig(tagName, branchPrefix, config.includeComponentInTag)) {
             logger_1.logger.debug(`found release for ${prefix}`, tagName.version);
             if (!commitShas.has(release.sha)) {
                 logger_1.logger.debug(`SHA not found in recent commits to branch ${targetBranch}, skipping`);
@@ -912,7 +912,7 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, prefix,
         if (!tagName) {
             continue;
         }
-        if (tagName.component === branchPrefix) {
+        if (tagMatchesConfig(tagName, branchPrefix, config.includeComponentInTag)) {
             if (!commitShas.has(tag.sha)) {
                 logger_1.logger.debug(`SHA not found in recent commits to branch ${targetBranch}, skipping`);
                 continue;
@@ -972,4 +972,13 @@ function commitsAfterSha(commits, lastReleaseSha) {
     }
     return commits.slice(0, index);
 }
+/**
+ * Returns true if the release tag matches the configured component. Returns
+ * true if `includeComponentInTag` is false and there is no component in the
+ * tag, OR if the tag's component matches the release component.
+ */
+function tagMatchesConfig(tag, branchComponent, includeComponentInTag) {
+    return ((includeComponentInTag && tag.component === branchComponent) ||
+        (!includeComponentInTag && !tag.component));
+}
 //# sourceMappingURL=manifest.js.map

package/package.json

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