From c456746f25a9712361cd11cd631dc0828d8b354f Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 8 Jul 2022 13:51:52 +0200 Subject: [PATCH 1/3] chore: only bump create-app on main release branch Signed-off-by: blam --- scripts/prepare-release.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/prepare-release.js b/scripts/prepare-release.js index e4c987733d..962d54abb0 100755 --- a/scripts/prepare-release.js +++ b/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 => { From b4b92e6325b79d601700b9ba671a5c79b149823a Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 8 Jul 2022 13:54:50 +0200 Subject: [PATCH 2/3] chore: moving around some changelog entries to their correct place Signed-off-by: blam --- plugins/scaffolder-backend/CHANGELOG.md | 5 +---- plugins/scaffolder/CHANGELOG.md | 9 +++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md index ed97db5617..2ac49898d2 100644 --- a/plugins/scaffolder-backend/CHANGELOG.md +++ b/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 diff --git a/plugins/scaffolder/CHANGELOG.md b/plugins/scaffolder/CHANGELOG.md index a8a606c73d..26a08c4b68 100644 --- a/plugins/scaffolder/CHANGELOG.md +++ b/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 From f0feea36c4d9cdd74a01e868b1a9cbd6fd84e8ae Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 8 Jul 2022 13:59:15 +0200 Subject: [PATCH 3/3] remove the old changesets that have already been released Signed-off-by: blam --- .changeset/eleven-mice-collect.md | 5 ----- .changeset/polite-eagles-invite.md | 7 ------- .changeset/pre.json | 2 -- 3 files changed, 14 deletions(-) delete mode 100644 .changeset/eleven-mice-collect.md delete mode 100644 .changeset/polite-eagles-invite.md diff --git a/.changeset/eleven-mice-collect.md b/.changeset/eleven-mice-collect.md deleted file mode 100644 index 66c4591d8e..0000000000 --- a/.changeset/eleven-mice-collect.md +++ /dev/null @@ -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. diff --git a/.changeset/polite-eagles-invite.md b/.changeset/polite-eagles-invite.md deleted file mode 100644 index f9c5073a83..0000000000 --- a/.changeset/polite-eagles-invite.md +++ /dev/null @@ -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`. diff --git a/.changeset/pre.json b/.changeset/pre.json index 7b30cba7ba..1b03a40575 100644 --- a/.changeset/pre.json +++ b/.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",