From e3585f52212f0d0d951504d127cb0f5ae26c1c8d Mon Sep 17 00:00:00 2001 From: Simon Stamm Date: Wed, 15 Sep 2021 11:45:00 +0200 Subject: [PATCH 1/3] Change hardcoded master to $defaultBranch Since we pass over the defaultBranch argument in our templates, this seems to break because of the hardcoded master values. Probably this affects other providers as well. Signed-off-by: Simon Stamm --- .../src/scaffolder/actions/builtin/publish/gitlab.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts index eead310777..5941f52746 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts @@ -127,7 +127,7 @@ export function createPublishGitlabAction(options: { }); const remoteUrl = (http_url_to_repo as string).replace(/\.git$/, ''); - const repoContentsUrl = `${remoteUrl}/-/blob/master`; + const repoContentsUrl = `${remoteUrl}/-/blob/${defaultBranch}`; const gitAuthorInfo = { name: config.getOptionalString('scaffolder.defaultAuthor.name'), From cfade02127e590a66e354b34989144559d031006 Mon Sep 17 00:00:00 2001 From: Simon Stamm Date: Wed, 15 Sep 2021 18:07:38 +0200 Subject: [PATCH 2/3] Add changeset to patch plugin-scaffolder-backend Signed-off-by: Simon Stamm --- .changeset/loud-hounds-listen.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/loud-hounds-listen.md diff --git a/.changeset/loud-hounds-listen.md b/.changeset/loud-hounds-listen.md new file mode 100644 index 0000000000..ec8e011993 --- /dev/null +++ b/.changeset/loud-hounds-listen.md @@ -0,0 +1,6 @@ +--- +"@backstage/plugin-scaffolder-backend": patch +--- + +Change hardcoded branch `master` to $defaultBranch + From d73e51bd90682710fd4dd089d1ac2c4ec687b5e0 Mon Sep 17 00:00:00 2001 From: Simon Stamm Date: Thu, 16 Sep 2021 09:58:12 +0200 Subject: [PATCH 3/3] Add word hardcoded to vocab and fix syntax of changeset Signed-off-by: Simon Stamm --- .changeset/loud-hounds-listen.md | 5 ++--- .github/styles/vocab.txt | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.changeset/loud-hounds-listen.md b/.changeset/loud-hounds-listen.md index ec8e011993..5c04b3bf61 100644 --- a/.changeset/loud-hounds-listen.md +++ b/.changeset/loud-hounds-listen.md @@ -1,6 +1,5 @@ --- -"@backstage/plugin-scaffolder-backend": patch +'@backstage/plugin-scaffolder-backend': patch --- -Change hardcoded branch `master` to $defaultBranch - +Change hardcoded branch `master` to $defaultBranch in GitLab provider diff --git a/.github/styles/vocab.txt b/.github/styles/vocab.txt index 5c9d46ea8a..a38baab3dc 100644 --- a/.github/styles/vocab.txt +++ b/.github/styles/vocab.txt @@ -97,6 +97,7 @@ GraphQL graphviz Hackathons haproxy +hardcoded Helidon Heroku hoc