diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts index 6e3892cee5..fb15535453 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/githubRepoPush.ts @@ -107,6 +107,7 @@ export function createGithubRepoPushAction(options: { properties: { remoteUrl: outputProps.remoteUrl, repoContentsUrl: outputProps.repoContentsUrl, + commitHash: outputProps.commitHash, }, }, }, @@ -151,7 +152,7 @@ export function createGithubRepoPushAction(options: { const remoteUrl = targetRepo.data.clone_url; const repoContentsUrl = `${targetRepo.data.html_url}/blob/${defaultBranch}`; - await initRepoPushAndProtect( + const { commitHash } = await initRepoPushAndProtect( remoteUrl, octokitOptions.auth, ctx.workspacePath, @@ -180,6 +181,7 @@ export function createGithubRepoPushAction(options: { ctx.output('remoteUrl', remoteUrl); ctx.output('repoContentsUrl', repoContentsUrl); + ctx.output('commitHash', commitHash); }, }); } diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/outputProperties.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/outputProperties.ts index d5d6eb108f..99310e7385 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/outputProperties.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/github/outputProperties.ts @@ -23,5 +23,11 @@ const repoContentsUrl = { type: 'string', }; +const commitHash = { + title: 'The commithash of the initial commit', + type: 'string', +}; + export { remoteUrl }; export { repoContentsUrl }; +export { commitHash }; diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts index 6686ea3dba..e4bf7d0dcf 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/azure.ts @@ -108,6 +108,10 @@ export function createPublishAzureAction(options: { title: 'The Id of the created repository', type: 'string', }, + commitHash: { + title: 'The commithash of the initial commit', + type: 'string', + }, }, }, }, diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts index 72c7f065ab..6169a315eb 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucket.ts @@ -289,6 +289,10 @@ export function createPublishBitbucketAction(options: { title: 'A URL to the root of the repository', type: 'string', }, + commitHash: { + title: 'The commithash of the initial commit', + type: 'string', + }, }, }, }, diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts index 419abdd8f0..feeb58d5c0 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketCloud.ts @@ -182,6 +182,10 @@ export function createPublishBitbucketCloudAction(options: { title: 'A URL to the root of the repository', type: 'string', }, + commitHash: { + title: 'The commithash of the initial commit', + type: 'string', + }, }, }, }, diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts index c990d14086..cceb5d8135 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts @@ -205,6 +205,10 @@ export function createPublishBitbucketServerAction(options: { title: 'A URL to the root of the repository', type: 'string', }, + commitHash: { + title: 'The commithash of the initial commit', + type: 'string', + }, }, }, }, diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts index e72d1d9011..a6652e08d8 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gerrit.ts @@ -149,6 +149,10 @@ export function createPublishGerritAction(options: { title: 'A URL to the root of the repository', type: 'string', }, + commitHash: { + title: 'The commithash of the initial commit', + type: 'string', + }, }, }, }, diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts index cefb57270c..ef74c62083 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts @@ -156,6 +156,7 @@ export function createPublishGithubAction(options: { properties: { remoteUrl: outputProps.remoteUrl, repoContentsUrl: outputProps.repoContentsUrl, + commitHash: outputProps.commitHash, }, }, }, 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 4b2f7ee727..46414e965a 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts @@ -125,6 +125,10 @@ export function createPublishGitlabAction(options: { title: 'The ID of the project', type: 'string', }, + commitHash: { + title: 'The commithash of the initial commit', + type: 'string', + }, }, }, },