release-please 13.4.11 → 13.4.12

package/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.4.12](https://github.com/googleapis/release-please/compare/v13.4.11...v13.4.12) (2022-02-22)
+
+
+### Bug Fixes
+
+* address false-positive matches for autorelease branch naming ([#1311](https://github.com/googleapis/release-please/issues/1311)) ([c5e76dc](https://github.com/googleapis/release-please/commit/c5e76dc8202958ed5af0f3635188261b8845f561)), closes [#1310](https://github.com/googleapis/release-please/issues/1310)
+* catch FileNotFound error when building changeset ([#1306](https://github.com/googleapis/release-please/issues/1306)) ([3944b17](https://github.com/googleapis/release-please/commit/3944b17f33500cecc63a1ff63db81cdbd50ce1a1))
+* manifest config should allow overriding labels ([#1303](https://github.com/googleapis/release-please/issues/1303)) ([f4d0314](https://github.com/googleapis/release-please/commit/f4d0314d1a394389a233ba9e1383852f0875dcd1)), closes [#1302](https://github.com/googleapis/release-please/issues/1302)
+
 ### [13.4.11](https://github.com/googleapis/release-please/compare/v13.4.10...v13.4.11) (2022-02-18)
 
 

package/build/src/github.js

@@ -883,7 +883,7 @@ class GitHub {
                 content = await this.getFileContentsOnBranch(update.path, defaultBranch);
             }
             catch (err) {
-                if (err.status !== 404)
+                if (!(err instanceof errors_1.FileNotFoundError))
                     throw err;
                 // if the file is missing and create = false, just continue
                 // to the next update, otherwise create the file.

package/build/src/manifest.js

@@ -629,6 +629,8 @@ async function parseConfig(github, configFile, branch) {
     for (const path in config.packages) {
         repositoryConfig[path] = mergeReleaserConfig(defaultConfig, extractReleaserConfig(config.packages[path]));
     }
+    const configLabel = config['label'];
+    const configReleaseLabel = config['release-label'];
     const manifestOptions = {
         bootstrapSha: config['bootstrap-sha'],
         lastReleaseSha: config['last-release-sha'],
@@ -636,6 +638,8 @@ async function parseConfig(github, configFile, branch) {
         separatePullRequests: config['separate-pull-requests'],
         groupPullRequestTitlePattern: config['group-pull-request-title-pattern'],
         plugins: config['plugins'],
+        labels: configLabel === undefined ? undefined : [configLabel],
+        releaseLabels: configReleaseLabel === undefined ? undefined : [configReleaseLabel],
     };
     return { config: repositoryConfig, options: manifestOptions };
 }

package/build/src/util/branch-name.js

@@ -82,8 +82,12 @@ exports.BranchName = BranchName;
  * @see https://github.com/googleapis/releasetool
  */
 const AUTORELEASE_PATTERN = /^release-?(?<component>[\w-.]*)?-v(?<version>[0-9].*)$/;
+const RELEASE_PLEASE_BRANCH_PREFIX = 'release-please--branches';
 class AutoreleaseBranchName extends BranchName {
     static matches(branchName) {
+        if (branchName.startsWith(RELEASE_PLEASE_BRANCH_PREFIX)) {
+            return false;
+        }
         return !!branchName.match(AUTORELEASE_PATTERN);
     }
     constructor(branchName) {

package/package.json

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