Merge branch 'main' into fix-workspace-with-separeta-pullrequest

googleapis · Sep 11, 2024 · 9092b4b · 9092b4b
2 parents f447a63 + 427db6d
commit 9092b4b
Show file tree

Hide file tree

Showing 29 changed files with 906 additions and 95 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -3,6 +3,7 @@ on:
     branches:
       - main
   pull_request:
+  merge_group:
 name: ci
 jobs:
   test:

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "16.12.0"
+  ".": "16.12.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,19 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [16.12.1](https://github.com/googleapis/release-please/compare/v16.12.0...v16.12.1) (2024-09-11)
+
+
+### Bug Fixes
+
+* add missing generic updaters in to release please config schema extraFiles ([#2344](https://github.com/googleapis/release-please/issues/2344)) ([050cf93](https://github.com/googleapis/release-please/commit/050cf93f272e76f0fc7a408fc9e85ab02321459c))
+* don't escape html tags inside of inline code in release notes ([#2367](https://github.com/googleapis/release-please/issues/2367)) ([a41d137](https://github.com/googleapis/release-please/commit/a41d13787b6676b73c87b9e03ff952289928c0fd))
+* fix comment at release pr is ugly ([#2348](https://github.com/googleapis/release-please/issues/2348)) ([e562ee2](https://github.com/googleapis/release-please/commit/e562ee21c8820d99007604cd930022816ce6c76c))
+* GenericJSON updater uses regex to find version in matching entry ([#2253](https://github.com/googleapis/release-please/issues/2253)) ([acc3242](https://github.com/googleapis/release-please/commit/acc3242b1e35349ada51e0d41a66e8fad29000f6))
+* prevent open release PRs from being mistaken as current releases ([#2323](https://github.com/googleapis/release-please/issues/2323)) ([3101ab3](https://github.com/googleapis/release-please/commit/3101ab32a1898d265277f543f1fca08793ec9a41))
+* respect `tagSeparator` and `includeVInTag` everywhere ([#2283](https://github.com/googleapis/release-please/issues/2283)) ([dad27e3](https://github.com/googleapis/release-please/commit/dad27e385e4cfdec18c84a1b48c3b45ab65abe5e)), closes [#2282](https://github.com/googleapis/release-please/issues/2282)
+* respect signoff in manifest config ([#2334](https://github.com/googleapis/release-please/issues/2334)) ([eb968c8](https://github.com/googleapis/release-please/commit/eb968c8cbbf666355b87612e3bb704e1611e1747))
+
 ## [16.12.0](https://github.com/googleapis/release-please/compare/v16.11.0...v16.12.0) (2024-06-06)
 
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -62,7 +62,7 @@ accept your pull requests.
    The below command should be run from the root of the source code:
 
    ```
-   node build/src/bin/release-please.js release-pr \
+   npm run compile && node build/src/bin/release-please.js release-pr \
    --token=$GITHUB_TOKEN \
    --repo-url=<owner>/<repo> [extra options]
    ```

diff --git a/__snapshots__/default-changelog-notes.js b/__snapshots__/default-changelog-notes.js
@@ -153,6 +153,15 @@ exports['DefaultChangelogNotes buildNotes with commit parsing should handle html
 * render all imagesets as &lt;picture&gt; ([383fb14](https://github.com/googleapis/java-asset/commit/383fb14708ae91f7bb7e64bf0bacab38))
 `
 
+exports['DefaultChangelogNotes buildNotes with commit parsing should handle html tags as inline code 1'] = `
+## [1.2.3](https://github.com/googleapis/java-asset/compare/v1.2.2...v1.2.3) (1983-10-10)
+
+
+### Features
+
+* render all imagesets as &lt;picture&gt; \`<picture>\` \`\` \`<picture>\` \`\` ([82fcfaf](https://github.com/googleapis/java-asset/commit/82fcfaf039487566a6e2d49a215afe09))
+`
+
 exports['DefaultChangelogNotes buildNotes with commit parsing should handle inline bug links 1'] = `
 ## [1.2.3](https://github.com/googleapis/java-asset/compare/v1.2.2...v1.2.3) (1983-10-10)
 

diff --git a/__snapshots__/generic-json.js b/__snapshots__/generic-json.js
@@ -46,3 +46,14 @@ exports['GenericJson updateContent updates matching entry 1'] = `
 }
 
 `
+
+exports['GenericJson updateContent updates substring in matching entry 1'] = `
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>abc/foo:xyz/sub#2.3.4",
+    "github>abc/bar:xyz/sub#2.3.4"
+  ]
+}
+
+`
diff --git a/__snapshots__/github.js b/__snapshots__/github.js
diff --git a/__snapshots__/node-workspace.js b/__snapshots__/node-workspace.js
@@ -238,6 +238,61 @@ Release notes for path: node1, releaseType: node
 This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
 `
 
+exports['NodeWorkspace plugin run walks dependency tree and updates previously untouched packages (prerelease) 1'] = `
+:robot: I have created a release *beep* *boop*
+---
+
+
+<details><summary>@here/pkgA: 3.3.4-beta</summary>
+
+Release notes for path: node1, releaseType: node
+</details>
+
+<details><summary>pkgB: 2.2.3-beta</summary>
+
+## [2.2.3-beta](https://github.com/googleapis/node-test-repo/compare/pkgB-v2.2.2-beta...pkgB-v2.2.3-beta) (1983-10-10)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @here/pkgA bumped from 3.3.3 to 3.3.4-beta
+</details>
+
+<details><summary>pkgC: 1.1.2-beta</summary>
+
+## 1.1.2-beta (1983-10-10)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @here/pkgB bumped from 2.2.2 to 2.2.3-beta
+</details>
+
+<details><summary>@here/pkgD: 4.4.5-beta</summary>
+
+Release notes for path: node4, releaseType: node
+</details>
+
+<details><summary>pkgE: 1.0.1-beta</summary>
+
+## 1.0.1-beta (1983-10-10)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @here/pkgA bumped to 3.3.4-beta
+</details>
+
+---
+This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
+`
+
 exports['NodeWorkspace plugin run walks dependency tree and updates previously untouched packages 1'] = `
 :robot: I have created a release *beep* *boop*
 ---

diff --git a/docs/customizing.md b/docs/customizing.md
@@ -199,7 +199,7 @@ force the [Generic](/src/updaters/generic.ts) updater, you must use type
 
 ## Updating arbitrary JSON files
 
-For files with the `.xml` extension, the `version` property is updated.
+For files with the `.json` extension, the `version` property is updated.
 
 For most release strategies, you can provide additional files to update
 using the [GenericJson](/src/updaters/generic-json.ts) updater. You can