release-please 15.10.3 → 15.10.5

package/CHANGELOG.md

@@ -4,6 +4,21 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [15.10.5](https://github.com/googleapis/release-please/compare/v15.10.4...v15.10.5) (2023-05-26)
+
+
+### Bug Fixes
+
+* Allow configuring multiple, separate linked-versions plugins ([#1961](https://github.com/googleapis/release-please/issues/1961)) ([a3fac52](https://github.com/googleapis/release-please/commit/a3fac52b909bf62cfd934c48d139cc3cae9d37f1))
+* **php-yoshi:** Remove manifest.json, Version.php, and ServiceBuilder.php ([#1949](https://github.com/googleapis/release-please/issues/1949)) ([09fb84b](https://github.com/googleapis/release-please/commit/09fb84b9244649622b556a78a8b03f664213bcb7))
+
+## [15.10.4](https://github.com/googleapis/release-please/compare/v15.10.3...v15.10.4) (2023-04-19)
+
+
+### Bug Fixes
+
+* Add more trace logging when searching for latest release version ([#1922](https://github.com/googleapis/release-please/issues/1922)) ([c33cc81](https://github.com/googleapis/release-please/commit/c33cc8112fc366242182bcb3a28015c488f6140b))
+
 ## [15.10.3](https://github.com/googleapis/release-please/compare/v15.10.2...v15.10.3) (2023-04-11)
 
 

package/build/src/manifest.js

@@ -373,7 +373,9 @@ class Manifest {
         // Combine pull requests into 1 unless configured for separate
         // pull requests
         if (!this.separatePullRequests) {
-            this.plugins.push(new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig, this.groupPullRequestTitlePattern));
+            this.plugins.push(new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig, {
+                pullRequestTitlePattern: this.groupPullRequestTitlePattern,
+            }));
         }
         for (const plugin of this.plugins) {
             this.logger.debug(`running plugin: ${plugin.constructor.name}`);
@@ -920,19 +922,23 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, config,
         commitShas.add(commitWithPullRequest.sha);
         const mergedPullRequest = commitWithPullRequest.pullRequest;
         if (!mergedPullRequest) {
+            logger.trace(`skipping commit: ${commitWithPullRequest.sha} missing merged pull request`);
             continue;
         }
         const branchName = branch_name_1.BranchName.parse(mergedPullRequest.headBranchName, logger);
         if (!branchName) {
+            logger.trace(`skipping commit: ${commitWithPullRequest.sha} unrecognized branch name: ${mergedPullRequest.headBranchName}`);
             continue;
         }
         // If branchPrefix is specified, ensure it is found in the branch name.
         // If branchPrefix is not specified, component should also be undefined.
         if (branchName.getComponent() !== branchPrefix) {
+            logger.trace(`skipping commit: ${commitWithPullRequest.sha} branch component ${branchName.getComponent()} doesn't match expected prefix: ${branchPrefix}`);
             continue;
         }
         const pullRequestTitle = pull_request_title_1.PullRequestTitle.parse(mergedPullRequest.title, config.pullRequestTitlePattern, logger);
         if (!pullRequestTitle) {
+            logger.trace(`skipping commit: ${commitWithPullRequest.sha} couldn't parse pull request title: ${mergedPullRequest.title}`);
             continue;
         }
         const version = pullRequestTitle.getVersion();

package/build/src/plugins/linked-versions.js

@@ -18,6 +18,7 @@ const plugin_1 = require("../plugin");
 const commit_1 = require("../commit");
 const factory_1 = require("../factory");
 const merge_1 = require("./merge");
+const branch_name_1 = require("../util/branch-name");
 /**
  * This plugin reconfigures strategies by linking multiple components
  * together.
@@ -107,6 +108,7 @@ class LinkedVersions extends plugin_1.ManifestPlugin {
         const [inScopeCandidates, outOfScopeCandidates] = candidates.reduce((collection, candidate) => {
             if (!candidate.pullRequest.version) {
                 this.logger.warn('pull request missing version', candidate);
+                collection[1].push(candidate);
                 return collection;
             }
             if (this.components.has(candidate.config.component || '')) {
@@ -120,7 +122,11 @@ class LinkedVersions extends plugin_1.ManifestPlugin {
         this.logger.info(`found ${inScopeCandidates.length} linked-versions candidates`);
         // delegate to the merge plugin and add merged pull request
         if (inScopeCandidates.length > 0) {
-            const merge = new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig, `chore\${scope}: release ${this.groupName} libraries`);
+            const merge = new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig, {
+                pullRequestTitlePattern: `chore\${scope}: release ${this.groupName} libraries`,
+                forceMerge: true,
+                headBranchName: branch_name_1.BranchName.ofGroupTargetBranch(this.groupName, this.targetBranch).toString(),
+            });
             const merged = await merge.run(inScopeCandidates);
             outOfScopeCandidates.push(...merged);
         }

package/build/src/plugins/merge.d.ts

@@ -1,6 +1,12 @@
 import { ManifestPlugin } from '../plugin';
 import { CandidateReleasePullRequest, RepositoryConfig } from '../manifest';
 import { GitHub } from '../github';
+interface MergeOptions {
+    pullRequestTitlePattern?: string;
+    pullRequestHeader?: string;
+    headBranchName?: string;
+    forceMerge?: boolean;
+}
 /**
  * This plugin merges multiple pull requests into a single
  * release pull request.
@@ -10,6 +16,9 @@ import { GitHub } from '../github';
 export declare class Merge extends ManifestPlugin {
     private pullRequestTitlePattern?;
     private pullRequestHeader?;
-    constructor(github: GitHub, targetBranch: string, repositoryConfig: RepositoryConfig, pullRequestTitlePattern?: string, pullRequestHeader?: string);
+    private headBranchName?;
+    private forceMerge;
+    constructor(github: GitHub, targetBranch: string, repositoryConfig: RepositoryConfig, options?: MergeOptions);
     run(candidates: CandidateReleasePullRequest[]): Promise<CandidateReleasePullRequest[]>;
 }
+export {};

package/build/src/plugins/merge.js

@@ -27,19 +27,23 @@ const composite_1 = require("../updaters/composite");
  * Release notes are broken up using `<summary>`/`<details>` blocks.
  */
 class Merge extends plugin_1.ManifestPlugin {
-    constructor(github, targetBranch, repositoryConfig, pullRequestTitlePattern, pullRequestHeader) {
+    constructor(github, targetBranch, repositoryConfig, options = {}) {
+        var _a, _b;
         super(github, targetBranch, repositoryConfig);
         this.pullRequestTitlePattern =
-            pullRequestTitlePattern || manifest_1.MANIFEST_PULL_REQUEST_TITLE_PATTERN;
-        this.pullRequestHeader = pullRequestHeader;
+            (_a = options.pullRequestTitlePattern) !== null && _a !== void 0 ? _a : manifest_1.MANIFEST_PULL_REQUEST_TITLE_PATTERN;
+        this.pullRequestHeader = options.pullRequestHeader;
+        this.headBranchName = options.headBranchName;
+        this.forceMerge = (_b = options.forceMerge) !== null && _b !== void 0 ? _b : false;
     }
     async run(candidates) {
+        var _a;
         if (candidates.length < 1) {
             return candidates;
         }
         this.logger.info(`Merging ${candidates.length} pull requests`);
         const [inScopeCandidates, outOfScopeCandidates] = candidates.reduce((collection, candidate) => {
-            if (candidate.config.separatePullRequests) {
+            if (candidate.config.separatePullRequests && !this.forceMerge) {
                 collection[1].push(candidate);
             }
             else {
@@ -71,7 +75,7 @@ class Merge extends plugin_1.ManifestPlugin {
             }),
             updates,
             labels: Array.from(labels),
-            headRefName: branch_name_1.BranchName.ofTargetBranch(this.targetBranch).toString(),
+            headRefName: (_a = this.headBranchName) !== null && _a !== void 0 ? _a : branch_name_1.BranchName.ofTargetBranch(this.targetBranch).toString(),
             draft: !candidates.some(candidate => !candidate.pullRequest.draft),
         };
         const releaseTypes = new Set(candidates.map(candidate => candidate.config.releaseType));

package/build/src/strategies/php-yoshi.js

@@ -17,7 +17,6 @@ exports.PHPYoshi = void 0;
 const base_1 = require("./base");
 const changelog_1 = require("../updaters/changelog");
 const root_composer_update_packages_1 = require("../updaters/php/root-composer-update-packages");
-const php_manifest_1 = require("../updaters/php/php-manifest");
 const php_client_version_1 = require("../updaters/php/php-client-version");
 const version_1 = require("../version");
 const commit_1 = require("../commit");
@@ -184,8 +183,7 @@ class PHPYoshi extends base_1.BaseStrategy {
                 changelogEntry: options.changelogEntry,
             }),
         });
-        // update the aggregate package information in the root
-        // composer.json and manifest.json.
+        // update the aggregate package information in the root composer.json
         updates.push({
             path: this.addPath('composer.json'),
             createIfMissing: false,
@@ -194,30 +192,6 @@ class PHPYoshi extends base_1.BaseStrategy {
                 versionsMap,
             }),
         });
-        updates.push({
-            path: this.addPath('docs/manifest.json'),
-            createIfMissing: false,
-            updater: new php_manifest_1.PHPManifest({
-                version,
-                versionsMap,
-            }),
-        });
-        updates.push({
-            path: this.addPath('src/Version.php'),
-            createIfMissing: false,
-            updater: new php_client_version_1.PHPClientVersion({
-                version,
-                versionsMap,
-            }),
-        });
-        updates.push({
-            path: this.addPath('src/ServiceBuilder.php'),
-            createIfMissing: false,
-            updater: new php_client_version_1.PHPClientVersion({
-                version,
-                versionsMap,
-            }),
-        });
         return updates;
     }
 }

package/build/src/util/branch-name.d.ts

@@ -9,6 +9,7 @@ export declare class BranchName {
     static ofVersion(version: Version): BranchName;
     static ofTargetBranch(targetBranch: string): BranchName;
     static ofComponentTargetBranch(component: string, targetBranch: string): BranchName;
+    static ofGroupTargetBranch(group: string, targetBranch: string): BranchName;
     constructor(_branchName: string);
     static matches(_branchName: string): boolean;
     getTargetBranch(): string | undefined;

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

@@ -25,6 +25,7 @@ function getAllResourceNames() {
     return [
         AutoreleaseBranchName,
         ComponentBranchName,
+        GroupBranchName,
         DefaultBranchName,
         V12ComponentBranchName,
         V12DefaultBranchName,
@@ -58,6 +59,9 @@ class BranchName {
     static ofComponentTargetBranch(component, targetBranch) {
         return new ComponentBranchName(`${RELEASE_PLEASE}--branches--${targetBranch}--components--${component}`);
     }
+    static ofGroupTargetBranch(group, targetBranch) {
+        return new GroupBranchName(`${RELEASE_PLEASE}--branches--${targetBranch}--groups--${safeBranchName(group)}`);
+    }
     constructor(_branchName) { }
     static matches(_branchName) {
         return false;
@@ -186,4 +190,27 @@ class ComponentBranchName extends BranchName {
         return `${RELEASE_PLEASE}--branches--${this.targetBranch}--components--${this.component}`;
     }
 }
+const GROUP_PATTERN = `^${RELEASE_PLEASE}--branches--(?<branch>.+)--groups--(?<group>.+)$`;
+class GroupBranchName extends BranchName {
+    static matches(branchName) {
+        return !!branchName.match(GROUP_PATTERN);
+    }
+    constructor(branchName) {
+        super(branchName);
+        const match = branchName.match(GROUP_PATTERN);
+        if (match === null || match === void 0 ? void 0 : match.groups) {
+            this.targetBranch = match.groups['branch'];
+            this.component = match.groups['group'];
+        }
+    }
+    toString() {
+        return `${RELEASE_PLEASE}--branches--${this.targetBranch}--groups--${this.component}`;
+    }
+}
+function safeBranchName(branchName) {
+    // convert disallowed characters in branch names, replacing them with '-'.
+    // replace multiple consecutive '-' with a single '-' to avoid interfering with
+    // our regexes for parsing the branch names
+    return branchName.replace(/[^\w\d]/g, '-').replace(/-+/g, '-');
+}
 //# sourceMappingURL=branch-name.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "15.10.3",
+  "version": "15.10.5",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -63,7 +63,7 @@
     "gts": "^3.1.0",
     "mocha": "^9.2.2",
     "nock": "^13.0.0",
-    "sinon": "15.0.3",
+    "sinon": "15.1.0",
     "snap-shot-it": "^7.0.0"
   },
   "dependencies": {

package/build/src/updaters/php/php-manifest.d.ts

@@ -1,14 +0,0 @@
-import { Logger } from '../../util/logger';
-import { DefaultUpdater } from '../default';
-/**
- * Updates a manifest.json file.
- * @see https://github.com/googleapis/google-cloud-php/blob/master/docs/manifest.json
- */
-export declare class PHPManifest extends DefaultUpdater {
-    /**
-     * Given initial file contents, return updated contents.
-     * @param {string} content The initial content
-     * @returns {string} The updated content
-     */
-    updateContent(content: string, logger?: Logger): string;
-}

package/build/src/updaters/php/php-manifest.js

@@ -1,55 +0,0 @@
-"use strict";
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PHPManifest = void 0;
-const logger_1 = require("../../util/logger");
-const json_stringify_1 = require("../../util/json-stringify");
-const default_1 = require("../default");
-/**
- * Updates a manifest.json file.
- * @see https://github.com/googleapis/google-cloud-php/blob/master/docs/manifest.json
- */
-class PHPManifest extends default_1.DefaultUpdater {
-    /**
-     * Given initial file contents, return updated contents.
-     * @param {string} content The initial content
-     * @returns {string} The updated content
-     */
-    updateContent(content, logger = logger_1.logger) {
-        if (!this.versionsMap || this.versionsMap.size === 0) {
-            logger.info('no updates necessary');
-            return content;
-        }
-        const parsed = JSON.parse(content);
-        parsed.modules.forEach((module) => {
-            if (!this.versionsMap)
-                return;
-            for (const [key, version] of this.versionsMap) {
-                if (module.name === key) {
-                    logger.info(`adding ${key}@${version} to manifest`);
-                    module.versions.unshift(`v${version}`);
-                }
-            }
-            // the mono-repo's own API version should be added to the
-            // google/cloud key:
-            if (module.name === 'google/cloud') {
-                module.versions.unshift(`v${this.version}`);
-            }
-        });
-        return (0, json_stringify_1.jsonStringify)(parsed, content);
-    }
-}
-exports.PHPManifest = PHPManifest;
-//# sourceMappingURL=php-manifest.js.map