EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3501 gulp: Fix repository URL calculation

main
Dani Palou 2020-09-10 12:22:39 +02:00
parent eec22f91d1
commit e6ac209756
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gulp/task-push.js
View File

@ -169,27 +169,24 @@ class PushTask {
// Get the repository data for the project. // Get the repository data for the project.
let repositoryUrl = DevConfig.get(branchData.project + '.repositoryUrl'); let repositoryUrl = DevConfig.get(branchData.project + '.repositoryUrl');
let diffUrlTemplate = DevConfig.get(branchData.project + '.diffUrlTemplate', ''); let diffUrlTemplate = DevConfig.get(branchData.project + '.diffUrlTemplate', '');
let remoteUrl;
if (!repositoryUrl) { if (!repositoryUrl) {
// Calculate the repositoryUrl based on the remote URL. // Calculate the repositoryUrl based on the remote URL.
remoteUrl = await Git.getRemoteUrl(remote); repositoryUrl = await Git.getRemoteUrl(remote);
repositoryUrl = remoteUrl.replace(/^https?:\/\//, 'git://');
if (!repositoryUrl.match(/\.git$/)) {
repositoryUrl += '.git';
}
} }
// Make sure the repository URL uses the regular format.
repositoryUrl = repositoryUrl.replace(/^(git@|git:\/\/)/, 'https://')
.replace(/\.git$/, '')
.replace('github.com:', 'github.com/');
if (!diffUrlTemplate) { if (!diffUrlTemplate) {
// Calculate the diffUrlTemplate based on the remote URL. diffUrlTemplate = Utils.concatenatePaths([repositoryUrl, 'compare/%headcommit%...%branch%']);
if (!remoteUrl) {
remoteUrl = await Git.getRemoteUrl(remoteUrl);
}
diffUrlTemplate = remoteUrl + '/compare/%headcommit%...%branch%';
} }
// Now create the git URL for the repository.
const repositoryGitUrl = repositoryUrl.replace(/^https?:\/\//, 'git://') + '.git';
// Search HEAD commit to put in the diff URL. // Search HEAD commit to put in the diff URL.
console.log ('Searching for head commit...'); console.log ('Searching for head commit...');
let headCommit = await Git.getHeadCommit(branch, branchData); let headCommit = await Git.getHeadCommit(branch, branchData);
@ -209,7 +206,7 @@ class PushTask {
// Update tracker fields. // Update tracker fields.
const updates = {}; const updates = {};
updates[fieldRepositoryUrl] = repositoryUrl; updates[fieldRepositoryUrl] = repositoryGitUrl;
updates[fieldBranch] = branch; updates[fieldBranch] = branch;
updates[fieldDiffUrl] = diffUrl; updates[fieldDiffUrl] = diffUrl;