release-please 15.10.2 → 15.10.4

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [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)
+
+
+### Bug Fixes
+
+* NeedsBootstrap computation also considers tags ([#1915](https://github.com/googleapis/release-please/issues/1915)) ([2773b6e](https://github.com/googleapis/release-please/commit/2773b6e8ae6bf7bd98adb89ed0eb702a1705b27b))
+
 ## [15.10.2](https://github.com/googleapis/release-please/compare/v15.10.1...v15.10.2) (2023-04-11)
 
 

package/README.md

@@ -52,6 +52,26 @@ The most important prefixes you should have in mind are:
 * `feat!:`,  or `fix!:`, `refactor!:`, etc., which represent a breaking change
   (indicated by the `!`) and will result in a SemVer major.
 
+### Linear git commit history (use squash-merge)
+
+We **highly** recommend that you use squash-merges when merging pull requests.
+A linear git history makes it much easier to:
+
+* Follow history - commits are sorted by merge date and are not mixed between
+  pull requests
+* Find and revert bugs - `git bisect` is helpful for tracking down which
+  change introduced a bug
+* Control the release-please changelog - when you merge a PR, you may have
+  commit messages that make sense within the scope of the PR, but don't
+  make sense when merged in the main branch. For example, you make have
+  `feat: introduce feature A` and then `fix: some bugfix introduced in
+  the first commit`. The `fix` commit is actually irrelevant to the release
+  notes as there was never a bug experienced in the main branch.
+* Keep a clean main branch - if you use something like red/green development
+  (create a failing test in commit A, then fix in commit B) and merge (or
+  rebase-merge), then there will be points in time in your main branch where
+  tests do not pass.
+
 ### What if my PR contains multiple fixes or features?
 
 Release Please allows you to represent multiple changes in a single commit,
@@ -79,7 +99,7 @@ The above commit message will contain:
   that it's a breaking change.
 3. an entry for the feature **"update encode to support unicode"**.
 
-> :warning: **Important:** The additional messages must be added to the bottom of the commit.
+:warning: **Important:** The additional messages must be added to the bottom of the commit.
 
 ## How do I change the version number?
 
@@ -113,6 +133,10 @@ END_COMMIT_OVERRIDE
 The next time Release Please runs, it will use that override section as the
 commit message instead of the merged commit message.
 
+:warning: **Important:** This feature will not work with plain merges because
+release-please does not know which commit(s) to apply the override to. [We
+recommend using squash-merge instead](#linear-git-commit-history-use-squash-merge).
+
 ## Release Please bot does not create a release PR. Why?
 
 Release Please creates a release pull request after it notices the default branch

package/build/src/manifest.js

@@ -225,7 +225,6 @@ class Manifest {
                 break;
             }
         }
-        const needsBootstrap = releasesFound < expectedReleases;
         if (releasesFound < expectedReleases) {
             this.logger.warn(`Expected ${expectedReleases} releases, only found ${releasesFound}`);
             // Fall back to looking for missing releases using expected tags
@@ -238,6 +237,7 @@ class Manifest {
                 releasesFound++;
             }
         }
+        const needsBootstrap = releasesFound < expectedReleases;
         if (releasesFound < expectedReleases) {
             this.logger.warn(`Expected ${expectedReleases} releases, only found ${releasesFound}`);
         }
@@ -920,19 +920,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/package.json

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