diff --git a/plugins/git-release-manager/dev/index.tsx b/plugins/git-release-manager/dev/index.tsx index d1d2d6e7d9..ba794e7b21 100644 --- a/plugins/git-release-manager/dev/index.tsx +++ b/plugins/git-release-manager/dev/index.tsx @@ -82,8 +82,8 @@ createDevApp() successCb: ({ comparisonUrl, createdTag, - gitHubReleaseName, - gitHubReleaseUrl, + gitReleaseName, + gitReleaseUrl, previousTag, }) => { // eslint-disable-next-line no-console @@ -91,8 +91,8 @@ createDevApp() 'Custom success callback for Create RC', comparisonUrl, createdTag, - gitHubReleaseName, - gitHubReleaseUrl, + gitReleaseName, + gitReleaseUrl, previousTag, ); }, diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts index a5a174ebd2..d922658d2c 100644 --- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts +++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts @@ -163,7 +163,7 @@ export function useCreateReleaseCandidate({ }, [createRcRes.value, createRcRes.error]); /** - * (4) Creates the release itself in GitHub + * (4) Creates the Git Release itself */ const createReleaseRes = useAsync(async () => { abortIfError(getComparisonRes.error); @@ -202,8 +202,8 @@ export function useCreateReleaseCandidate({ await successCb({ comparisonUrl: getComparisonRes.value.htmlUrl, createdTag: createReleaseRes.value.tagName, - gitHubReleaseName: createReleaseRes.value.name, - gitHubReleaseUrl: createReleaseRes.value.htmlUrl, + gitReleaseName: createReleaseRes.value.name, + gitReleaseUrl: createReleaseRes.value.htmlUrl, previousTag: latestRelease?.tagName, }); } catch (error) { diff --git a/plugins/git-release-manager/src/features/Features.tsx b/plugins/git-release-manager/src/features/Features.tsx index ce715654ae..3649b0c3f7 100644 --- a/plugins/git-release-manager/src/features/Features.tsx +++ b/plugins/git-release-manager/src/features/Features.tsx @@ -65,9 +65,7 @@ export function Features({ } if (gitBatchInfo.value === undefined) { - return ( - Failed to fetch latest GitHub release - ); + return Failed to fetch latest Git release; } if (!gitBatchInfo.value.repository.pushPermissions) { diff --git a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts index 075700f2c1..ba236b29ce 100644 --- a/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts +++ b/plugins/git-release-manager/src/features/PromoteRc/hooks/usePromoteRc.ts @@ -77,8 +77,8 @@ export function usePromoteRc({ try { await successCb?.({ - gitHubReleaseUrl: promotedReleaseRes.value.htmlUrl, - gitHubReleaseName: promotedReleaseRes.value.name, + gitReleaseUrl: promotedReleaseRes.value.htmlUrl, + gitReleaseName: promotedReleaseRes.value.name, previousTagUrl: rcRelease.htmlUrl, previousTag: rcRelease.tagName, updatedTagUrl: promotedReleaseRes.value.htmlUrl, diff --git a/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.test.ts b/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.test.ts index 23aa7366b7..c27e37ce86 100644 --- a/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.test.ts +++ b/plugins/git-release-manager/src/helpers/getReleaseCandidateGitInfo.test.ts @@ -34,7 +34,7 @@ describe('getReleaseCandidateGitInfo', () => { }); describe('calver', () => { - it('should return correct GitHub info', () => { + it('should return correct Git info', () => { expect( getReleaseCandidateGitInfo({ project: mockCalverProject, @@ -53,7 +53,7 @@ describe('getReleaseCandidateGitInfo', () => { }); describe('semver', () => { - it("should return correct GitHub info when there's previous releases", () => { + it("should return correct Git info when there's previous releases", () => { expect( getReleaseCandidateGitInfo({ project: mockSemverProject, @@ -69,7 +69,7 @@ describe('getReleaseCandidateGitInfo', () => { `); }); - it("should return correct GitHub info when there's no previous release", () => { + it("should return correct Git info when there's no previous release", () => { expect( getReleaseCandidateGitInfo({ project: mockSemverProject, diff --git a/plugins/git-release-manager/src/types/types.ts b/plugins/git-release-manager/src/types/types.ts index ece840fa5f..8e2a034d3a 100644 --- a/plugins/git-release-manager/src/types/types.ts +++ b/plugins/git-release-manager/src/types/types.ts @@ -20,8 +20,8 @@ export type ComponentConfig = { }; interface CreateRcSuccessCbArgs { - gitHubReleaseUrl: string; - gitHubReleaseName: string | null; + gitReleaseUrl: string; + gitReleaseName: string | null; comparisonUrl: string; previousTag?: string; createdTag: string; @@ -29,8 +29,8 @@ interface CreateRcSuccessCbArgs { export type ComponentConfigCreateRc = ComponentConfig; interface PromoteRcSuccessCbArgs { - gitHubReleaseUrl: string; - gitHubReleaseName: string | null; + gitReleaseUrl: string; + gitReleaseName: string | null; previousTagUrl: string; previousTag: string; updatedTagUrl: string;