Merge pull request #12538 from backstage/blam/patch-release-cleanup

Some minor fixes for things after patch release

.changeset/eleven-mice-collect.md

@@ -1,5 +0,0 @@
----
-'@backstage/plugin-scaffolder-backend': minor
----
-
-Added a new `/v2/dry-run` endpoint that allows for a synchronous dry run of a provided template. A `supportsDryRun` option has been added to `createTemplateAction`, which signals whether the action should be executed during dry runs. When enabled, the action context will have the new `isDryRun` property set to signal if the action is being executed during a dry run.

.changeset/polite-eagles-invite.md

@@ -1,7 +0,0 @@
----
-'@backstage/plugin-scaffolder': minor
----
-
-A new template editor has been added which is accessible via the context menu on the top right hand corner of the Create page. It allows you to load a template from a local directory, edit it with a preview, execute it in dry-run mode, and view the results. Note that the [File System Access API](https://developer.mozilla.org/en-US/docs/Web/API/File_System_Access_API) must be supported by your browser for this to be available.
-
-To support the new template editor the `ScaffolderApi` now has an optional `dryRun` method, which is implemented by the default `ScaffolderClient`.

.changeset/pre.json

@@ -176,7 +176,6 @@
     "curvy-weeks-matter",
     "eight-suits-fail",
     "eighty-windows-brush",
-    "eleven-mice-collect",
     "five-fireants-run",
     "forty-seals-complain",
     "great-roses-pump",
@@ -196,7 +195,6 @@
     "nervous-humans-sip",
     "old-onions-hear",
     "plenty-clouds-guess",
-    "polite-eagles-invite",
     "polite-lions-sell",
     "popular-pots-yell",
     "pretty-masks-live",

plugins/scaffolder-backend/CHANGELOG.md

@@ -40,10 +40,6 @@
 
 ## 1.4.0-next.0
 
-### Minor Changes
-
-- 3500c13a33: Added a new `/v2/dry-run` endpoint that allows for a synchronous dry run of a provided template. A `supportsDryRun` option has been added to `createTemplateAction`, which signals whether the action should be executed during dry runs. When enabled, the action context will have the new `isDryRun` property set to signal if the action is being executed during a dry run.
-
 ### Patch Changes
 
 - Updated dependencies
@@ -86,6 +82,7 @@
   - Added a route under `/v2/tasks` to list tasks by a `userEntityRef` using the `createdBy` query parameter
 - c042c5eaff: Add an option to not protect the default branch.
 - f93af969cd: Added the ability to support running of templates that are not in the `default` namespace
+- 3500c13a33: Added a new `/v2/dry-run` endpoint that allows for a synchronous dry run of a provided template. A `supportsDryRun` option has been added to `createTemplateAction`, which signals whether the action should be executed during dry runs. When enabled, the action context will have the new `isDryRun` property set to signal if the action is being executed during a dry run.
 
 ### Patch Changes
 

plugins/scaffolder/CHANGELOG.md

@@ -44,12 +44,6 @@
 
 ## 1.4.0-next.0
 
-### Minor Changes
-
-- 3500c13a33: A new template editor has been added which is accessible via the context menu on the top right hand corner of the Create page. It allows you to load a template from a local directory, edit it with a preview, execute it in dry-run mode, and view the results. Note that the [File System Access API](https://developer.mozilla.org/en-US/docs/Web/API/File_System_Access_API) must be supported by your browser for this to be available.
-
-  To support the new template editor the `ScaffolderApi` now has an optional `dryRun` method, which is implemented by the default `ScaffolderClient`.
-
 ### Patch Changes
 
 - 37539e29d8: The template editor now shows the cause of request errors that happen during a dry-run.
@@ -92,6 +86,9 @@
 
 - 72dfcbc8bf: Gerrit Integration: Implemented a `RepoUrlPicker` for Gerrit.
 - f93af969cd: Added the ability to support running of templates that are not in the `default` namespace
+- 3500c13a33: A new template editor has been added which is accessible via the context menu on the top right hand corner of the Create page. It allows you to load a template from a local directory, edit it with a preview, execute it in dry-run mode, and view the results. Note that the [File System Access API](https://developer.mozilla.org/en-US/docs/Web/API/File_System_Access_API) must be supported by your browser for this to be available.
+
+  To support the new template editor the `ScaffolderApi` now has an optional `dryRun` method, which is implemented by the default `ScaffolderClient`.
 
 ### Patch Changes
 

scripts/prepare-release.js

@@ -394,10 +394,10 @@ async function main() {
   if (isMainBranch) {
     console.log('Main release, updating package versions');
     await updatePackageVersions(repo);
+    await ensureCreateAppChangeset();
   }
 
   await updateBackstageReleaseVersion(repo, isMainBranch ? 'minor' : 'patch');
-  await ensureCreateAppChangeset();
 }
 
 main().catch(error => {