release-please 17.5.1 → 17.6.0

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 = "17.5.1";
+export declare const VERSION = "17.6.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 = '17.5.1';
+exports.VERSION = '17.6.0';
 // x-release-please-end
 //# sourceMappingURL=index.js.map

package/build/src/local-github.d.ts

@@ -185,7 +185,6 @@ export declare class LocalGitHub implements Scm {
      * @throws {GitHubAPIError} on an API error
      */
     tagIterator(options?: ScmTagIteratorOptions): AsyncGenerator<ScmTag, void, void>;
-    private applyEditsAndPush;
     /**
      * Open a pull request
      *

package/build/src/local-github.js

@@ -20,6 +20,7 @@ const os = require("os");
 const child_process = require("child_process");
 const util = require("util");
 const readline = require("readline");
+const code_suggester_1 = require("code-suggester");
 const execFile = util.promisify(child_process.execFile);
 const mkdtemp = fs.promises.mkdtemp;
 const errors_1 = require("./errors");
@@ -71,8 +72,12 @@ class LocalGitHub {
                 logger.info(`Using existing local repository at ${repoDir}...`);
             }
             const branch = gitHubApi.repository.defaultBranch;
-            logger.debug('Executing: git fetch origin');
-            await execFile('git', ['fetch', 'origin'], { cwd: repoDir });
+            const fetchArgs = ['fetch', 'origin'];
+            if (options.cloneDepth) {
+                fetchArgs.push('--depth', options.cloneDepth.toString());
+            }
+            logger.debug(`Executing: git ${fetchArgs.join(' ')}`);
+            await execFile('git', fetchArgs, { cwd: repoDir });
             logger.debug(`Executing: git checkout ${branch}`);
             await execFile('git', ['checkout', branch], { cwd: repoDir });
             logger.debug(`Executing: git reset --hard origin/${branch}`);
@@ -536,55 +541,6 @@ class LocalGitHub {
             }
         }
     }
-    async applyEditsAndPush(branch, targetBranch, message, changes) {
-        this.logger.debug(`Applying edits and pushing to ${branch}`);
-        // Checkout/Reset PR branch
-        await execFile('git', ['fetch', 'origin', '--', targetBranch], {
-            cwd: this.cloneDir,
-        });
-        await execFile('git', ['checkout', '-B', branch, `origin/${targetBranch}`], {
-            cwd: this.cloneDir,
-        });
-        // Write file edits
-        for (const [filePath, fileUpdate] of changes.entries()) {
-            const fullPath = path.join(this.cloneDir, filePath);
-            await fs.promises.mkdir(path.dirname(fullPath), { recursive: true });
-            if (fileUpdate.content !== null) {
-                await fs.promises.writeFile(fullPath, fileUpdate.content);
-            }
-            else {
-                await fs.promises.unlink(fullPath).catch(() => { });
-            }
-            if (fileUpdate.mode) {
-                await fs.promises.chmod(fullPath, parseInt(fileUpdate.mode, 8));
-            }
-        }
-        // Commit changes
-        const msgFile = path.join(os.tmpdir(), `release-please-commit-msg-${process.pid}-${Date.now()}`);
-        await fs.promises.writeFile(msgFile, message);
-        await execFile('git', ['add', '.'], { cwd: this.cloneDir });
-        try {
-            await execFile('git', ['commit', '--no-verify', '-F', msgFile], {
-                cwd: this.cloneDir,
-            });
-        }
-        catch (err) {
-            const error = err;
-            if (error.stdout && error.stdout.includes('nothing to commit')) {
-                this.logger.debug('Nothing to commit');
-            }
-            else {
-                throw err;
-            }
-        }
-        finally {
-            await fs.promises.unlink(msgFile).catch(() => { });
-        }
-        // Push transit
-        await execFile('git', ['push', '--no-verify', '-f', 'origin', branch], {
-            cwd: this.cloneDir,
-        });
-    }
     /**
      * Open a pull request
      *
@@ -597,9 +553,33 @@ class LocalGitHub {
      */
     async createPullRequest(pullRequest, targetBranch, message, updates, options) {
         const changes = await this.buildChangeSet(updates, targetBranch);
-        await this.applyEditsAndPush(pullRequest.headBranchName, targetBranch, message, changes);
-        this.logger.info('Creating pull request via GitHub API...');
-        return await this.gitHubApi.createPullRequest(pullRequest, targetBranch, options);
+        const prNumber = await (0, code_suggester_1.createPullRequest)(this.gitHubApi.octokit, changes, {
+            upstreamOwner: this.repository.owner,
+            upstreamRepo: this.repository.repo,
+            title: pullRequest.title,
+            branch: pullRequest.headBranchName,
+            description: pullRequest.body,
+            primary: targetBranch,
+            force: true,
+            fork: !!(options === null || options === void 0 ? void 0 : options.fork),
+            message,
+            logger: this.logger,
+            draft: !!(options === null || options === void 0 ? void 0 : options.draft),
+            labels: pullRequest.labels,
+        });
+        if (prNumber === 0) {
+            this.logger.warn('no code changes detected, skipping pull request creation');
+            return {
+                headBranchName: pullRequest.headBranchName,
+                baseBranchName: targetBranch,
+                number: 0,
+                title: pullRequest.title,
+                body: pullRequest.body,
+                labels: pullRequest.labels,
+                files: [],
+            };
+        }
+        return await this.getPullRequest(prNumber);
     }
     /**
      * Update a pull request's title and body.
@@ -615,31 +595,29 @@ class LocalGitHub {
     async updatePullRequest(number, pullRequest, targetBranch, options) {
         const changes = await this.buildChangeSet(pullRequest.updates, targetBranch);
         const message = pullRequest.title.toString();
-        await this.applyEditsAndPush(pullRequest.headRefName, targetBranch, message, changes);
+        const title = pullRequest.title.toString();
         const body = ((options === null || options === void 0 ? void 0 : options.pullRequestOverflowHandler)
             ? await options.pullRequestOverflowHandler.handleOverflow(pullRequest)
             : pullRequest.body)
             .toString()
             .slice(0, github_api_1.MAX_ISSUE_BODY_SIZE);
-        const pullResponseData = (await this.gitHubApi.octokit.pulls.update({
-            owner: this.repository.owner,
-            repo: this.repository.repo,
-            pull_number: number,
-            title: pullRequest.title.toString(),
-            body,
-            state: 'open',
-        })).data;
-        return {
-            headBranchName: pullResponseData.head.ref,
-            baseBranchName: pullResponseData.base.ref,
-            number: pullResponseData.number,
-            title: pullResponseData.title,
-            body: pullResponseData.body || '',
-            files: [],
-            labels: pullResponseData.labels
-                .map((label) => label.name)
-                .filter((name) => !!name),
-        };
+        const prNumber = await (0, code_suggester_1.createPullRequest)(this.gitHubApi.octokit, changes, {
+            upstreamOwner: this.repository.owner,
+            upstreamRepo: this.repository.repo,
+            title,
+            branch: pullRequest.headRefName,
+            description: body,
+            primary: targetBranch,
+            force: true,
+            fork: (options === null || options === void 0 ? void 0 : options.fork) === false ? false : true,
+            message,
+            logger: this.logger,
+            draft: pullRequest.draft,
+        });
+        if (prNumber !== number) {
+            this.logger.warn(`updated code for ${prNumber}, but update requested for ${number}`);
+        }
+        return this.gitHubApi.updatePullRequest(number, title, body);
     }
     async getPullRequest(number) {
         return await this.gitHubApi.getPullRequest(number);

package/build/src/strategies/java-yoshi-mono-repo.js

@@ -23,6 +23,7 @@ const composite_1 = require("../updaters/composite");
 const errors_1 = require("../errors");
 const java_1 = require("./java");
 const java_update_1 = require("../updaters/java/java-update");
+const librarian_yaml_1 = require("../updaters/java/librarian-yaml");
 const filter_commits_1 = require("../util/filter-commits");
 class JavaYoshiMonoRepo extends java_1.Java {
     /**
@@ -87,6 +88,7 @@ class JavaYoshiMonoRepo extends java_1.Java {
         const dependenciesSearch = this.github.findFilesByFilenameAndRef('dependencies.properties', this.targetBranch, this.path);
         const readmeFilesSearch = this.github.findFilesByFilenameAndRef('README.md', this.targetBranch, this.path);
         const versionFilesSearch = this.github.findFilesByFilenameAndRef('Version.java', this.targetBranch, this.path);
+        const librarianFilesSearch = this.github.findFilesByFilenameAndRef('librarian.yaml', this.targetBranch, this.path);
         const pomFiles = await pomFilesSearch;
         pomFiles.forEach(path => {
             updates.push({
@@ -147,6 +149,17 @@ class JavaYoshiMonoRepo extends java_1.Java {
                 }),
             });
         });
+        const librarianFiles = await librarianFilesSearch;
+        librarianFiles.forEach(path => {
+            updates.push({
+                path: this.addPath(path),
+                createIfMissing: false,
+                updater: new librarian_yaml_1.LibrarianYamlUpdater({
+                    version,
+                    versionsMap,
+                }),
+            });
+        });
         this.extraFiles.forEach(extraFile => {
             if (typeof extraFile === 'object') {
                 return;

package/build/src/updaters/java/librarian-yaml.d.ts

@@ -0,0 +1,29 @@
+import { DefaultUpdater } from '../default';
+import { Logger } from '../../util/logger';
+export interface JavaModule {
+    distribution_name_override: string;
+    [key: string]: any;
+}
+export interface LibrarianLibrary {
+    name: string;
+    version: string;
+    java: JavaModule;
+    [key: string]: any;
+}
+export interface LibrarianYamlSchema {
+    libraries: LibrarianLibrary[];
+    [key: string]: any;
+}
+/**
+ * Updates a librarian.yaml file.
+ */
+export declare class LibrarianYamlUpdater extends DefaultUpdater {
+    specialArtifacts: ReadonlyMap<string, string>;
+    /**
+     * Given initial file contents, return updated contents.
+     * @param {string} content The initial content
+     * @returns {string} The updated content
+     */
+    updateContent(content: string, logger?: Logger): string;
+    findArtifactID(library: LibrarianLibrary): string;
+}

package/build/src/updaters/java/librarian-yaml.js

@@ -0,0 +1,81 @@
+"use strict";
+// Copyright 2026 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.LibrarianYamlUpdater = void 0;
+const default_1 = require("../default");
+const yaml = require("yaml");
+const logger_1 = require("../../util/logger");
+/**
+ * Updates a librarian.yaml file.
+ */
+class LibrarianYamlUpdater extends default_1.DefaultUpdater {
+    constructor() {
+        super(...arguments);
+        this.specialArtifacts = new Map([
+            ['google-cloud-java', 'google-cloud-java'],
+        ]);
+    }
+    /**
+     * 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) {
+            logger.warn('missing versions map');
+            return content;
+        }
+        // Use yaml package to make sure librarian.yaml is not reformatted because
+        // we use different tool to format librarian.yaml.
+        const doc = yaml.parseDocument(content);
+        if (!doc || doc.errors.length > 0) {
+            logger.warn('Invalid yaml, cannot be parsed');
+            return content;
+        }
+        const libraries = doc.get('libraries');
+        if (!libraries || !yaml.isSeq(libraries)) {
+            return content;
+        }
+        let modified = false;
+        for (const library of libraries.items) {
+            if (!yaml.isMap(library))
+                continue;
+            const artifactID = this.findArtifactID(library.toJSON());
+            if (this.versionsMap.has(artifactID)) {
+                const newVersion = this.versionsMap.get(artifactID);
+                if (newVersion && library.get('version') !== newVersion.toString()) {
+                    library.set('version', newVersion.toString());
+                    modified = true;
+                }
+            }
+        }
+        if (modified) {
+            return doc.toString({ lineWidth: 0 });
+        }
+        return content;
+    }
+    findArtifactID(library) {
+        const artifact = this.specialArtifacts.get(library.name);
+        if (artifact) {
+            return artifact;
+        }
+        if (library.java && library.java.distribution_name_override) {
+            return library.java.distribution_name_override.split(':')[1];
+        }
+        return `google-cloud-${library.name}`;
+    }
+}
+exports.LibrarianYamlUpdater = LibrarianYamlUpdater;
+//# sourceMappingURL=librarian-yaml.js.map

package/package.json

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