release-please 13.4.7 → 13.4.8

package/CHANGELOG.md

@@ -4,6 +4,19 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.4.8](https://github.com/googleapis/release-please/compare/v13.4.7...v13.4.8) (2022-02-08)
+
+
+### Bug Fixes
+
+* allow configuring includeComponentInTag and tagSeparator from manifest config ([71d9b6d](https://github.com/googleapis/release-please/commit/71d9b6d5775bb1a35157c7ec512ef4d1d9f7feec))
+* check recent commits and latest releases for latest version ([#1267](https://github.com/googleapis/release-please/issues/1267)) ([f931842](https://github.com/googleapis/release-please/commit/f931842a117c97dd117f161c89beb1c9e2257fa2))
+* correctly fetch full list of files ([71d9b6d](https://github.com/googleapis/release-please/commit/71d9b6d5775bb1a35157c7ec512ef4d1d9f7feec))
+* **go-yoshi:** allows using go-yoshi with manifest ([#1287](https://github.com/googleapis/release-please/issues/1287)) ([71d9b6d](https://github.com/googleapis/release-please/commit/71d9b6d5775bb1a35157c7ec512ef4d1d9f7feec))
+* **go-yoshi:** should not always skip modules ([71d9b6d](https://github.com/googleapis/release-please/commit/71d9b6d5775bb1a35157c7ec512ef4d1d9f7feec))
+* Manifest should be able to find tagged versions without a release ([71d9b6d](https://github.com/googleapis/release-please/commit/71d9b6d5775bb1a35157c7ec512ef4d1d9f7feec))
+* provide pull request to commit parser allow overrides ([#1285](https://github.com/googleapis/release-please/issues/1285)) ([e54028b](https://github.com/googleapis/release-please/commit/e54028bb39c4535f42b0b90c60b7f331847d005c))
+
 ### [13.4.7](https://github.com/googleapis/release-please/compare/v13.4.6...v13.4.7) (2022-02-02)
 
 

package/build/src/factory.js

@@ -123,6 +123,7 @@ async function buildStrategy(options) {
         changelogNotes,
         pullRequestTitlePattern: options.pullRequestTitlePattern,
         extraFiles: options.extraFiles,
+        tagSeparator: options.tagSeparator,
     };
     switch (options.releaseType) {
         case 'ruby': {

package/build/src/github.js

@@ -37,13 +37,25 @@ class GitHub {
          */
         this.getCommitFiles = wrapAsync(async (sha) => {
             logger_1.logger.debug(`Backfilling file list for commit: ${sha}`);
-            const resp = await this.octokit.repos.getCommit({
+            const files = [];
+            for await (const resp of this.octokit.paginate.iterator(this.octokit.repos.getCommit, {
                 owner: this.repository.owner,
                 repo: this.repository.repo,
                 ref: sha,
-            });
-            const files = resp.data.files || [];
-            return files.map(file => file.filename).filter(filename => !!filename);
+            })) {
+                for (const f of resp.data.files || []) {
+                    if (f.filename) {
+                        files.push(f.filename);
+                    }
+                }
+            }
+            if (files.length >= 3000) {
+                logger_1.logger.warn(`Found ${files.length} files. This may not include all the files.`);
+            }
+            else {
+                logger_1.logger.debug(`Found ${files.length} files`);
+            }
+            return files;
         });
         this.graphqlRequest = wrapAsync(async (opts, maxRetries = 1) => {
             while (maxRetries >= 0) {
@@ -509,6 +521,7 @@ class GitHub {
         }
     }
     async mergeCommitsGraphQL(targetBranch, cursor, options = {}) {
+        var _a;
         logger_1.logger.debug(`Fetching merge commits on branch ${targetBranch} with cursor: ${cursor}`);
         const response = await this.graphqlRequest({
             query: `query pullRequestsSince($owner: String!, $repo: String!, $num: Int!, $maxFilesChanged: Int, $targetBranch: String!, $cursor: String) {
@@ -562,7 +575,7 @@ class GitHub {
             repo: this.repository.repo,
             num: 25,
             targetBranch,
-            maxFilesChanged: 64,
+            maxFilesChanged: 100,
         });
         // if the branch does exist, return null
         if (!response.repository.ref) {
@@ -592,9 +605,15 @@ class GitHub {
                     labels: pullRequest.labels.nodes.map(node => node.name),
                     files,
                 };
-                // We cannot directly fetch files on commits via graphql, only provide file
-                // information for commits with associated pull requests
-                commit.files = files;
+                if (((_a = pullRequest.files.pageInfo) === null || _a === void 0 ? void 0 : _a.hasNextPage) && options.backfillFiles) {
+                    logger_1.logger.info(`PR #${pullRequest.number} has many files, backfilling`);
+                    commit.files = await this.getCommitFiles(graphCommit.sha);
+                }
+                else {
+                    // We cannot directly fetch files on commits via graphql, only provide file
+                    // information for commits with associated pull requests
+                    commit.files = files;
+                }
             }
             else if (options.backfillFiles) {
                 // In this case, there is no squashed merge commit. This could be a simple

package/build/src/manifest.d.ts

@@ -22,6 +22,7 @@ export interface ReleaserConfig {
     packageName?: string;
     includeComponentInTag?: boolean;
     pullRequestTitlePattern?: string;
+    tagSeparator?: string;
     changelogSections?: ChangelogSection[];
     changelogPath?: string;
     changelogType?: ChangelogNotesType;
@@ -54,6 +55,7 @@ interface ReleaserConfigJson {
     'include-component-in-tag'?: boolean;
     'changelog-type'?: ChangelogNotesType;
     'pull-request-title-pattern'?: string;
+    'tag-separator'?: string;
     'version-file'?: string;
     'extra-files'?: string[];
 }
@@ -196,6 +198,8 @@ export declare class Manifest {
      * @returns {ReleasePullRequest[]} The candidate pull requests to open or update.
      */
     buildPullRequests(): Promise<ReleasePullRequest[]>;
+    private backfillReleasesFromTags;
+    private getAllTags;
     /**
      * Opens/updates all candidate release pull requests for this repository.
      *

package/build/src/manifest.js

@@ -166,7 +166,6 @@ class Manifest {
         for await (const release of this.github.releaseIterator({
             maxResults: 400,
         })) {
-            // logger.debug(release);
             const tagName = tag_name_1.TagName.parse(release.tagName);
             if (!tagName) {
                 logger_1.logger.warn(`Unable to parse release name: ${release.name}`);
@@ -199,6 +198,18 @@ class Manifest {
             }
         }
         const needsBootstrap = releasesFound < expectedReleases;
+        if (releasesFound < expectedReleases) {
+            logger_1.logger.warn(`Expected ${expectedReleases} releases, only found ${releasesFound}`);
+            // Fall back to looking for missing releases using expected tags
+            const missingPaths = Object.keys(strategiesByPath).filter(path => !releasesByPath[path]);
+            logger_1.logger.warn(`Missing ${missingPaths.length} paths: ${missingPaths}`);
+            const missingReleases = await this.backfillReleasesFromTags(missingPaths, strategiesByPath);
+            for (const path in missingReleases) {
+                releaseShasByPath[path] = missingReleases[path].sha;
+                releasesByPath[path] = missingReleases[path];
+                releasesFound++;
+            }
+        }
         if (releasesFound < expectedReleases) {
             logger_1.logger.warn(`Expected ${expectedReleases} releases, only found ${releasesFound}`);
         }
@@ -246,6 +257,7 @@ class Manifest {
                 sha: commit.sha,
                 message: commit.message,
                 files: commit.files,
+                pullRequest: commit.pullRequest,
             });
         }
         if (releaseCommitsFound < expectedShas) {
@@ -322,6 +334,38 @@ class Manifest {
         }
         return newReleasePullRequests.map(pullRequestWithConfig => pullRequestWithConfig.pullRequest);
     }
+    async backfillReleasesFromTags(missingPaths, strategiesByPath) {
+        const releasesByPath = {};
+        const allTags = await this.getAllTags();
+        for (const path of missingPaths) {
+            const expectedVersion = this.releasedVersions[path];
+            if (!expectedVersion) {
+                logger_1.logger.warn(`No version for path ${path}`);
+                continue;
+            }
+            const component = await strategiesByPath[path].getComponent();
+            const expectedTag = new tag_name_1.TagName(expectedVersion, component, this.repositoryConfig[path].tagSeparator);
+            logger_1.logger.debug(`looking for tagName: ${expectedTag.toString()}`);
+            const foundTag = allTags[expectedTag.toString()];
+            if (foundTag) {
+                logger_1.logger.debug(`found: ${foundTag.name} ${foundTag.sha}`);
+                releasesByPath[path] = {
+                    name: foundTag.name,
+                    tag: expectedTag,
+                    sha: foundTag.sha,
+                    notes: '',
+                };
+            }
+        }
+        return releasesByPath;
+    }
+    async getAllTags() {
+        const allTags = {};
+        for await (const tag of this.github.tagIterator()) {
+            allTags[tag.name] = tag;
+        }
+        return allTags;
+    }
     /**
      * Opens/updates all candidate release pull requests for this repository.
      *
@@ -567,6 +611,7 @@ function extractReleaserConfig(config) {
         includeComponentInTag: config['include-component-in-tag'],
         changelogType: config['changelog-type'],
         pullRequestTitlePattern: config['pull-request-title-pattern'],
+        tagSeparator: config['tag-separator'],
     };
 }
 /**
@@ -628,6 +673,7 @@ async function latestReleaseVersion(github, targetBranch, prefix, pullRequestTit
     // collect set of recent commit SHAs seen to verify that the release
     // is in the current branch
     const commitShas = new Set();
+    const candidateReleaseVersions = [];
     // only look at the last 250 or so commits to find the latest tag - we
     // don't want to scan the entire repository history if this repo has never
     // been released
@@ -656,12 +702,15 @@ async function latestReleaseVersion(github, targetBranch, prefix, pullRequestTit
             // FIXME, don't hardcode this
             continue;
         }
-        return version;
+        if (version) {
+            logger_1.logger.debug(`Found latest release pull request: ${mergedPullRequest.number} version: ${version}`);
+            candidateReleaseVersions.push(version);
+            break;
+        }
     }
     // If not found from recent pull requests, look at releases. Iterate
     // through releases finding valid tags, then cross reference
     const releaseGenerator = github.releaseIterator();
-    const candidateReleaseVersions = [];
     for await (const release of releaseGenerator) {
         const tagName = tag_name_1.TagName.parse(release.tagName);
         if (!tagName) {
@@ -703,7 +752,7 @@ async function latestReleaseVersion(github, targetBranch, prefix, pullRequestTit
     return candidateTagVersion.sort((a, b) => b.compare(a))[0];
 }
 function mergeReleaserConfig(defaultConfig, pathConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
     return {
         releaseType: (_b = (_a = pathConfig.releaseType) !== null && _a !== void 0 ? _a : defaultConfig.releaseType) !== null && _b !== void 0 ? _b : 'node',
         bumpMinorPreMajor: (_c = pathConfig.bumpMinorPreMajor) !== null && _c !== void 0 ? _c : defaultConfig.bumpMinorPreMajor,
@@ -718,7 +767,9 @@ function mergeReleaserConfig(defaultConfig, pathConfig) {
         packageName: (_m = pathConfig.packageName) !== null && _m !== void 0 ? _m : defaultConfig.packageName,
         versionFile: (_o = pathConfig.versionFile) !== null && _o !== void 0 ? _o : defaultConfig.versionFile,
         extraFiles: (_p = pathConfig.extraFiles) !== null && _p !== void 0 ? _p : defaultConfig.extraFiles,
-        pullRequestTitlePattern: (_q = pathConfig.pullRequestTitlePattern) !== null && _q !== void 0 ? _q : defaultConfig.pullRequestTitlePattern,
+        includeComponentInTag: (_q = pathConfig.includeComponentInTag) !== null && _q !== void 0 ? _q : defaultConfig.includeComponentInTag,
+        tagSeparator: (_r = pathConfig.tagSeparator) !== null && _r !== void 0 ? _r : defaultConfig.tagSeparator,
+        pullRequestTitlePattern: (_s = pathConfig.pullRequestTitlePattern) !== null && _s !== void 0 ? _s : defaultConfig.pullRequestTitlePattern,
     };
 }
 /**

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

@@ -66,10 +66,6 @@ class GoYoshi extends base_1.BaseStrategy {
         logger_1.logger.debug('Filtering commits');
         return commits.filter(commit => {
             var _a, _b;
-            // ignore commits whose scope is in the list of ignored modules
-            if (IGNORED_SUB_MODULES.has(commit.scope || '')) {
-                return false;
-            }
             // Only have a single entry of the nightly regen listed in the changelog.
             // If there are more than one of these commits, append associated PR.
             if (this.repository.owner === 'googleapis' &&

package/package.json

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