release-please 16.10.2 → 16.12.0

package/README.md

@@ -207,7 +207,7 @@ There are a variety of ways you can deploy release-please:
 
 ### GitHub Action (recommended)
 
-The easiest way to run Release Please is as a GitHub action. Please see [google-github-actions/release-please-action](https://github.com/google-github-actions/release-please-action) for installation and configuration instructions.
+The easiest way to run Release Please is as a GitHub action. Please see [googleapis/release-please-action](https://github.com/googleapis/release-please-action) for installation and configuration instructions.
 
 ### Running as CLI
 

package/build/src/index.d.ts

@@ -14,4 +14,4 @@ export { Logger, setLogger } from './util/logger';
 export { GitHub } from './github';
 export declare const configSchema: any;
 export declare const manifestSchema: any;
-export declare const VERSION = "16.10.2";
+export declare const VERSION = "16.12.0";

package/build/src/index.js

@@ -36,6 +36,6 @@ Object.defineProperty(exports, "GitHub", { enumerable: true, get: function () {
 exports.configSchema = require('../../schemas/config.json');
 exports.manifestSchema = require('../../schemas/manifest.json');
 // x-release-please-start-version
-exports.VERSION = '16.10.2';
+exports.VERSION = '16.12.0';
 // x-release-please-end
 //# sourceMappingURL=index.js.map

package/build/src/manifest.js

@@ -687,7 +687,11 @@ class Manifest {
         this.logger.info(`Creating ${releases.length} releases for pull #${pullRequest.number}`);
         const duplicateReleases = [];
         const githubReleases = [];
+        let error;
         for (const release of releases) {
+            // stop releasing once we hit an error
+            if (error)
+                continue;
             try {
                 githubReleases.push(await this.createRelease(release));
             }
@@ -697,10 +701,21 @@ class Manifest {
                     duplicateReleases.push(err);
                 }
                 else {
-                    throw err;
+                    error = err;
                 }
             }
         }
+        if (githubReleases.length > 0) {
+            // comment on pull request about the successful releases
+            const releaseList = githubReleases
+                .map(({ tagName, url }) => `- [${tagName}](${url})`)
+                .join('\n');
+            const comment = `:robot: Created releases:\n${releaseList}\n:sunflower:`;
+            await this.github.commentOnIssue(comment, pullRequest.number);
+        }
+        if (error) {
+            throw error;
+        }
         if (duplicateReleases.length > 0) {
             if (duplicateReleases.length + githubReleases.length ===
                 releases.length) {
@@ -726,9 +741,6 @@ class Manifest {
             draft: release.draft,
             prerelease: release.prerelease,
         });
-        // comment on pull request
-        const comment = `:robot: Release is at ${githubRelease.url} :sunflower:`;
-        await this.github.commentOnIssue(comment, release.pullRequest.number);
         return {
             ...githubRelease,
             path: release.path,

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

@@ -55,6 +55,13 @@ class PHPYoshi extends base_1.BaseStrategy {
             this.logger.info(`No commits for path: ${this.path}, skipping`);
             return undefined;
         }
+        const versionOverrides = {};
+        commits.forEach(commit => {
+            var _a;
+            Object.entries(parseVersionOverrides(((_a = commit.pullRequest) === null || _a === void 0 ? void 0 : _a.body) || '')).forEach(([directory, version]) => {
+                versionOverrides[directory] = version;
+            });
+        });
         const newVersion = latestRelease
             ? await this.versioningStrategy.bump(latestRelease.tag.version, conventionalCommits)
             : this.initialReleaseVersion();
@@ -69,13 +76,14 @@ class PHPYoshi extends base_1.BaseStrategy {
         for (const directory of topLevelDirectories) {
             try {
                 const contents = await this.github.getFileContentsOnBranch(this.addPath(`${directory}/VERSION`), this.targetBranch);
-                const version = version_1.Version.parse(contents.parsedContent);
                 const composer = await this.github.getFileJson(this.addPath(`${directory}/composer.json`), this.targetBranch);
                 directoryVersionContents[directory] = {
                     versionContents: contents,
                     composer,
                 };
-                const newVersion = await this.versioningStrategy.bump(version, splitCommits[directory]);
+                const newVersion = versionOverrides[directory]
+                    ? version_1.Version.parse(versionOverrides[directory])
+                    : await this.versioningStrategy.bump(version_1.Version.parse(contents.parsedContent), splitCommits[directory]);
                 versionsMap.set(composer.name, newVersion);
                 const partialReleaseNotes = await this.changelogNotes.buildNotes(splitCommits[directory], {
                     host: this.changelogHost,
@@ -211,6 +219,22 @@ class PHPYoshi extends base_1.BaseStrategy {
     }
 }
 exports.PHPYoshi = PHPYoshi;
+function parseVersionOverrides(body) {
+    // look for 'BEGIN_VERSION_OVERRIDE' section of pull request body
+    const versionOverrides = {};
+    if (body) {
+        const overrideMessage = (body.split('BEGIN_VERSION_OVERRIDE')[1] || '')
+            .split('END_VERSION_OVERRIDE')[0]
+            .trim();
+        if (overrideMessage) {
+            overrideMessage.split('\n').forEach(line => {
+                const [directory, version] = line.split(':');
+                versionOverrides[directory.trim()] = version.trim();
+            });
+        }
+    }
+    return versionOverrides;
+}
 function updatePHPChangelogEntry(pkgKey, changelogEntry, entryUpdate) {
     // Remove the first line of the entry, in favor of <summary>.
     // This also allows us to use the same regex for extracting release

package/build/src/updaters/node/package-json.d.ts

@@ -35,6 +35,7 @@ export declare class PackageJson extends DefaultUpdater {
  * @param {Version} newVersion The new version to update with
  */
 export declare function newVersionWithRange(oldVersion: string, newVersion: Version): string;
+export declare const NPM_PROTOCOL_REGEXP: RegExp;
 /**
  * Helper function to update dependency versions for all new versions specified
  * in the updated versions map. Note that this mutates the existing input.

package/build/src/updaters/node/package-json.js

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDependencies = exports.newVersionWithRange = exports.PackageJson = void 0;
+exports.updateDependencies = exports.NPM_PROTOCOL_REGEXP = exports.newVersionWithRange = exports.PackageJson = void 0;
 const json_stringify_1 = require("../../util/json-stringify");
 const logger_1 = require("../../util/logger");
 const default_1 = require("../default");
@@ -82,6 +82,7 @@ function newVersionWithRange(oldVersion, newVersion) {
     return newVersion.toString();
 }
 exports.newVersionWithRange = newVersionWithRange;
+exports.NPM_PROTOCOL_REGEXP = /^[a-z]+:/;
 /**
  * Helper function to update dependency versions for all new versions specified
  * in the updated versions map. Note that this mutates the existing input.
@@ -91,9 +92,12 @@ exports.newVersionWithRange = newVersionWithRange;
  */
 function updateDependencies(dependencies, updatedVersions) {
     for (const depName of Object.keys(dependencies)) {
+        const oldVersion = dependencies[depName];
+        if (exports.NPM_PROTOCOL_REGEXP.test(oldVersion)) {
+            continue;
+        }
         const newVersion = updatedVersions.get(depName);
         if (newVersion) {
-            const oldVersion = dependencies[depName];
             dependencies[depName] = newVersionWithRange(oldVersion, newVersion);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "16.10.2",
+  "version": "16.12.0",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -50,7 +50,7 @@
     "@types/npmlog": "^7.0.0",
     "@types/pino": "^7.0.0",
     "@types/semver": "^7.0.0",
-    "@types/sinon": "^10.0.0",
+    "@types/sinon": "^17.0.0",
     "@types/xmldom": "^0.1.31",
     "@types/yargs": "^17.0.0",
     "ajv": "^8.11.0",
@@ -62,7 +62,7 @@
     "gts": "^3.1.0",
     "mocha": "^9.2.2",
     "nock": "^13.0.0",
-    "sinon": "16.0.0",
+    "sinon": "18.0.0",
     "snap-shot-it": "^7.0.0"
   },
   "dependencies": {

package/schemas/config.json

@@ -21,7 +21,7 @@
           "type": "boolean"
         },
         "prerelease-type": {
-          "description": "Configuration option for the prerelese versioning strategy. If prerelease strategy used and type set, will set the prerelese part of the version to the provided value in case prerelease part is not present.",
+          "description": "Configuration option for the prerelease versioning strategy. If prerelease strategy used and type set, will set the prerelease part of the version to the provided value in case prerelease part is not present.",
           "type": "string"
         },
         "versioning": {

package/build/src/updaters/terraform/readme.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"readme.js","sourceRoot":"","sources":["../../../../src/updaters/terraform/readme.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,wCAA0C;AAE1C;;GAEG;AACH,MAAa,MAAO,SAAQ,wBAAc;IACxC;;;;OAIG;IACH,aAAa,CAAC,OAAe;QAC3B,OAAO,OAAO,CAAC,OAAO,CACpB,4BAA4B,EAC5B,iBAAiB,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,CAC7D,CAAC;IACJ,CAAC;CACF;AAZD,wBAYC"}