Skip to content

Commit

Permalink
[fix] head branch is other conditions
Browse files Browse the repository at this point in the history
  • Loading branch information
@xcvdsfd
xcvdsfd committed Aug 7, 2023
1 parent c541581 commit 11b71e2
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 16 deletions.
18 changes: 10 additions & 8 deletions dist/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ getMatchName = function (headIn, baseIn) {
return failObj;
}
const channel = match[1];

let baseChannel = 'alpha';
if (channel == 'alpha') {
baseChannel = 'release';
Expand All @@ -91,11 +90,12 @@ getMatchName = function (headIn, baseIn) {
if (bashValidate != baseIn) {
return failObj;
}
const closeObj = { match: true, close: false, head: '', base: '' };
const devRef = headIn.replace('alpha', 'dev');
const closeObj = { match: true, close: false, head: '', base: '', dev: devRef };
if (channel == 'dev') {
return closeObj;
} else {
return { match: true, close: true, head: headIn.replace('alpha', 'dev'), base: headIn };
return { match: true, close: true, head: headIn.replace('alpha', 'dev'), base: headIn, dev: devRef };
}
};

Expand Down Expand Up @@ -126,21 +126,23 @@ exports.getPulls = async function (argv, prNumber) {
} else {
page++;
console.log('pr number', pulls.data[0].number, prNumber);
if (head && base) {
if (head && base && pulls.data[0].merged_at) {
curHead = pulls.data[0].head.ref;
curBase = pulls.data[0].base.ref;
if (head == curHead && base == curBase && pulls.data[0].merged_at) {
if (head == curHead && base == curBase) {
break;
} else if (curHead == matchName.head && curBase == matchName.base) {
await closeIssue(argv, pulls.data[0].number, true);
await closeIssue(argv, pulls.data[0].number, !!matchName.close);
} else if (curBase == matchName.dev) {
await closeIssue(argv, pulls.data[0].number, !!matchName.close);
}
} else if (!head && !base && pulls.data[0].number == prNumber) {
head = pulls.data[0].head.ref;
base = pulls.data[0].base.ref;
matchName = getMatchName(head, base);
console.log('head', head, 'base', base);
console.log('matchName', JSON.stringify(matchName));
if (!matchName.match) {
console.log('matchName', matchName);
if (!matchName.match || !pulls.data[0].merged_at) {
break;
}
if (pulls.data[0].merged_at) {
Expand Down
18 changes: 10 additions & 8 deletions lib.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ getMatchName = function (headIn, baseIn) {
return failObj;
}
const channel = match[1];

let baseChannel = 'alpha';
if (channel == 'alpha') {
baseChannel = 'release';
Expand All @@ -85,11 +84,12 @@ getMatchName = function (headIn, baseIn) {
if (bashValidate != baseIn) {
return failObj;
}
const closeObj = { match: true, close: false, head: '', base: '' };
const devRef = headIn.replace('alpha', 'dev');
const closeObj = { match: true, close: false, head: '', base: '', dev: devRef };
if (channel == 'dev') {
return closeObj;
} else {
return { match: true, close: true, head: headIn.replace('alpha', 'dev'), base: headIn };
return { match: true, close: true, head: headIn.replace('alpha', 'dev'), base: headIn, dev: devRef };
}
};

Expand Down Expand Up @@ -120,21 +120,23 @@ exports.getPulls = async function (argv, prNumber) {
} else {
page++;
console.log('pr number', pulls.data[0].number, prNumber);
if (head && base) {
if (head && base && pulls.data[0].merged_at) {
curHead = pulls.data[0].head.ref;
curBase = pulls.data[0].base.ref;
if (head == curHead && base == curBase && pulls.data[0].merged_at) {
if (head == curHead && base == curBase) {
break;
} else if (curHead == matchName.head && curBase == matchName.base) {
await closeIssue(argv, pulls.data[0].number, true);
await closeIssue(argv, pulls.data[0].number, !!matchName.close);
} else if (curBase == matchName.dev) {
await closeIssue(argv, pulls.data[0].number, !!matchName.close);
}
} else if (!head && !base && pulls.data[0].number == prNumber) {
head = pulls.data[0].head.ref;
base = pulls.data[0].base.ref;
matchName = getMatchName(head, base);
console.log('head', head, 'base', base);
console.log('matchName', JSON.stringify(matchName));
if (!matchName.match) {
console.log('matchName', matchName);
if (!matchName.match || !pulls.data[0].merged_at) {
break;
}
if (pulls.data[0].merged_at) {
Expand Down

0 comments on commit 11b71e2

Please sign in to comment.