Skip to content

Commit e02cf7a

Browse files
committed
fix(ui-scripts): disable git reset for RC releases
refs: INSTUI-1402 Change-Id: Ifaad378f4a661ecdf305f325f46e7d927d8fb767 Reviewed-on: https://gerrit.instructure.com/183571 Tested-by: Jenkins Reviewed-by: Steve Jensen <sejensen@instructure.com> QA-Review: Jennifer Stern <jstern@instructure.com> Product-Review: Jennifer Stern <jstern@instructure.com>
1 parent 5989e7a commit e02cf7a

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

packages/ui-scripts/lib/post-publish.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,13 @@ async function postPublish (packageName, releaseVersion, config = {}) {
6565

6666
if (isReleaseCommit(releaseVersion)) {
6767
createGitTagForRelease(releaseVersion)
68-
6968
if (hasJiraConfig(config)) {
7069
issueKeys = await getIssuesInRelease(jiraProjectKey)
7170
jiraVersion = await getJiraVersion(jiraVersion.name, config)
7271
if (issueKeys.length > 0 && jiraVersion.id) {
7372
await updateJiraIssues(issueKeys, jiraVersion.name, config)
7473
}
7574
}
76-
7775
if (hasSlackConfig(config)) {
7876
postStableReleaseSlackMessage(jiraVersion, issueKeys, config)
7977
}

packages/ui-scripts/lib/utils/git.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ exports.getIssuesInCommit = function getIssuesInCommit (jiraProjectKey) {
235235

236236
if (issueKeys.length > 0) {
237237
issueKeys = Array.from(new Set(issueKeys))
238-
info(`Issues in this release: ${issueKeys.join(', ')}`)
238+
info(`Issues in this commit: ${issueKeys.join(', ')}`)
239239
}
240240

241241
return issueKeys

packages/ui-scripts/lib/utils/npm.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ async function publishPackages (packageName, releaseVersion = 'prerelease', prei
112112
'--yes',
113113
'--no-push',
114114
'--no-git-tag-version',
115+
'--no-git-reset',
115116
'--force-publish=*'
116117
])
117118

0 commit comments

Comments
 (0)