studio/studio-admin-be
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

harden release promotion fallback on conflict
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse Source
This commit is contained in:
chyoo
2026-07-07 18:14:35 +09:00
parent ce99890dc8
commit e74c296b7e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/apps.service.ts
+1 -2
View File
@@ -729,7 +729,7 @@ export class AppsService {
try { try {
await this.resolveReleaseMergeByTakingSourceOnConflict(gitBin, workDir, mergeOptions, commitSha, repository); await this.resolveReleaseMergeByTakingSourceOnConflict(gitBin, workDir, mergeOptions, commitSha, repository);
} catch { } catch {
await this.promoteReleaseBySourceSnapshot(gitBin, workDir, mergeOptions, commitSha, targetBranch, repository); await this.promoteReleaseBySourceSnapshot(gitBin, workDir, commitSha, targetBranch, repository);
} }
} }
} }
@@ -781,7 +781,6 @@ export class AppsService {
private async promoteReleaseBySourceSnapshot( private async promoteReleaseBySourceSnapshot(
gitBin: string, gitBin: string,
workDir: string, workDir: string,
mergeOptions: string[],
commitSha: string, commitSha: string,
targetBranch: string, targetBranch: string,
repository: string, repository: string,