From 4cd2787846f4d44dc36838abf40d2a20531b147a Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Fri, 25 Feb 2022 08:13:46 +0100
Subject: [PATCH] chore: update the changeset in main for the emergency release

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/patched.json                                     | 4 +++-
 .changeset/smart-items-fry.md                               | 2 +-
 plugins/scaffolder-backend/CHANGELOG.md                     | 6 ++++++
 .../scaffolder/actions/builtin/publish/githubPullRequest.ts | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.changeset/patched.json b/.changeset/patched.json
index 1029c8f106..c8a00c5421 100644
--- a/.changeset/patched.json
+++ b/.changeset/patched.json
@@ -1,3 +1,5 @@
 {
-  "currentReleaseVersion": {}
+  "currentReleaseVersion": {
+    "@backstage/plugin-scaffolder-backend": "0.17.1"
+  }
 }
diff --git a/.changeset/smart-items-fry.md b/.changeset/smart-items-fry.md
index 06ddd08979..625db82ce7 100644
--- a/.changeset/smart-items-fry.md
+++ b/.changeset/smart-items-fry.md
@@ -2,4 +2,4 @@
 '@backstage/plugin-scaffolder-backend': patch
 ---
 
-Fix broken GitHub PR action due to malformed `repoUrl`
+Applied fix from `v0.17.1` of this package which is part of the `v0.69.1` release of Backstage.
diff --git a/plugins/scaffolder-backend/CHANGELOG.md b/plugins/scaffolder-backend/CHANGELOG.md
index 38617922ed..1e48dcc57e 100644
--- a/plugins/scaffolder-backend/CHANGELOG.md
+++ b/plugins/scaffolder-backend/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.17.1
+
+### Patch Changes
+
+- bug: fixing `repoUrl` resolution for `publish:github:pull-request` action
+
 ## 0.17.0
 
 ### Minor Changes
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 e4458508ef..110c865fc6 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/githubPullRequest.ts
@@ -72,7 +72,7 @@ export const defaultClientFactory = async ({
   const octokitOptions = await getOctokitOptions({
     integrations,
     credentialsProvider: githubCredentialsProvider,
-    repoUrl: `${encodedHost}?owner=${encodedOwner}&repo=${encodedRepo}`,
+    repoUrl: `https://${encodedHost}?owner=${encodedOwner}&repo=${encodedRepo}`,
     token: providedToken,
   });