From d1c549ea9d090b751f9a56b3c7b96dd0bd722d46 Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Mon, 23 Oct 2023 09:40:15 +0000 Subject: [PATCH 1/3] Pass update input to createPullRequest (fixes: #17911) Signed-off-by: Alex Eftimie --- .../actions/builtin/publish/githubPullRequest.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts index a02f21cfc2..3b6e7c3ced 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts @@ -142,6 +142,7 @@ export const createPublishGithubPullRequestAction = ( reviewers?: string[]; teamReviewers?: string[]; commitMessage?: string; + update?: boolean; }>({ id: 'publish:github:pull-request', examples, @@ -219,6 +220,11 @@ export const createPublishGithubPullRequestAction = ( title: 'Commit Message', description: 'The commit message for the pull request commit', }, + update: { + type: 'boolean', + title: 'Update', + description: 'Update pull request if already exists', + }, }, }, output: { @@ -256,6 +262,7 @@ export const createPublishGithubPullRequestAction = ( reviewers, teamReviewers, commitMessage, + update, } = ctx.input; const { owner, repo, host } = parseRepoUrl(repoUrl, integrations); @@ -327,6 +334,7 @@ export const createPublishGithubPullRequestAction = ( body: description, head: branchName, draft, + update, }; if (targetBranchName) { createOptions.base = targetBranchName; From 5e4127c18ee24b96995aa5dd1aad9ee74a733f23 Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Mon, 23 Oct 2023 10:11:53 +0000 Subject: [PATCH 2/3] Add changeset Signed-off-by: Alex Eftimie --- .changeset/tall-colts-roll.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/tall-colts-roll.md diff --git a/.changeset/tall-colts-roll.md b/.changeset/tall-colts-roll.md new file mode 100644 index 0000000000..914a09cdac --- /dev/null +++ b/.changeset/tall-colts-roll.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-scaffolder-backend': minor +--- + +Allow setting `update: true` in `publish:github:pull-request` scaffolder action From 11aa8d4ee86b868150483b912502fb83fc4b40f4 Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Mon, 23 Oct 2023 10:51:16 +0000 Subject: [PATCH 3/3] Update api-reports Signed-off-by: Alex Eftimie --- plugins/scaffolder-backend/api-report.md | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/scaffolder-backend/api-report.md b/plugins/scaffolder-backend/api-report.md index ba7576b1bb..1f8615b477 100644 --- a/plugins/scaffolder-backend/api-report.md +++ b/plugins/scaffolder-backend/api-report.md @@ -659,6 +659,7 @@ export const createPublishGithubPullRequestAction: ( reviewers?: string[] | undefined; teamReviewers?: string[] | undefined; commitMessage?: string | undefined; + update?: boolean | undefined; }, JsonObject >;