Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bugs in createOrUpdateStagingDeploy #3815

Merged
merged 8 commits into from
Jul 7, 2021
Merged

Fix bugs in createOrUpdateStagingDeploy #3815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b27ccb8
Add log line for npm_version in createOrUpdateStagingDeploy
roryabraham Jun 29, 2021
63cca4e
Make sure we use a reasonable PR list even for adding deploy blockers
roryabraham Jun 29, 2021
8acfa62
pass adjusted tag instead of newVersion
roryabraham Jun 29, 2021
1a40a38
Rebuild GH actions
roryabraham Jun 29, 2021
c8e0d09
Create separate function for fetchAllPullRequests
roryabraham Jun 30, 2021
29d7ec7
Add log line for automated pull requests
roryabraham Jun 30, 2021
e39c7a3
Merge branch 'main' into Rory-FixStagingDeployCashPagination
roryabraham Jul 2, 2021
338788f
Remove duplicate function
roryabraham Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions .github/actions/checkDeployBlockers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,26 +288,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
26 changes: 16 additions & 10 deletions .github/actions/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const GitUtils = require('../../libs/GitUtils');

const run = function () {
const newVersion = core.getInput('NPM_VERSION');
console.log('New version found from action input:', newVersion);

let shouldCreateNewStagingDeployCash = false;
let currentStagingDeployCashIssueNumber = null;
Expand All @@ -26,8 +27,7 @@ const run = function () {
labels: GithubUtils.DEPLOY_BLOCKER_CASH_LABEL,
}),
])
.then((results) => {
const [stagingDeployResponse, deployBlockerResponse] = results;
.then(([stagingDeployResponse, deployBlockerResponse]) => {
if (!stagingDeployResponse || !stagingDeployResponse.data || _.isEmpty(stagingDeployResponse.data)) {
console.error('Failed fetching StagingDeployCash issues from Github!', stagingDeployResponse);
throw new Error('Failed fetching StagingDeployCash issues from Github');
Expand Down Expand Up @@ -58,15 +58,14 @@ const run = function () {

console.log('Found tag of previous StagingDeployCash:', previousStagingDeployCashData.tag);

// Find the list of PRs merged between the last StagingDeployCash and the new version
const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, newVersion);
console.log(
'The following PRs have been merged between the previous StagingDeployCash and new version:',
mergedPRs,
);

if (shouldCreateNewStagingDeployCash) {
// We're in the create flow, not update
// Find the list of PRs merged between the last StagingDeployCash and the new version
const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, newVersion);
console.log(
'The following PRs have been merged between the previous StagingDeployCash and new version:',
mergedPRs,
);

// TODO: if there are open DeployBlockers and we are opening a new checklist,
// then we should close / remove the DeployBlockerCash label from those
return GithubUtils.generateStagingDeployCashBody(
Expand All @@ -89,6 +88,13 @@ const run = function () {
// If we aren't sent a tag, then use the existing tag
const tag = newVersion || currentStagingDeployCashData.tag;

// Find the list of PRs merged between the last StagingDeployCash and the new version
const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, tag);
console.log(
'The following PRs have been merged between the previous StagingDeployCash and new version:',
mergedPRs,
);

// Generate the PR list, preserving the previous state of `isVerified` for existing PRs
const PRList = _.sortBy(
_.unique(
Expand Down
43 changes: 18 additions & 25 deletions .github/actions/createOrUpdateStagingDeploy/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const GitUtils = __nccwpck_require__(669);

const run = function () {
const newVersion = core.getInput('NPM_VERSION');
console.log('New version found from action input:', newVersion);

let shouldCreateNewStagingDeployCash = false;
let currentStagingDeployCashIssueNumber = null;
Expand All @@ -36,8 +37,7 @@ const run = function () {
labels: GithubUtils.DEPLOY_BLOCKER_CASH_LABEL,
}),
])
.then((results) => {
const [stagingDeployResponse, deployBlockerResponse] = results;
.then(([stagingDeployResponse, deployBlockerResponse]) => {
if (!stagingDeployResponse || !stagingDeployResponse.data || _.isEmpty(stagingDeployResponse.data)) {
console.error('Failed fetching StagingDeployCash issues from Github!', stagingDeployResponse);
throw new Error('Failed fetching StagingDeployCash issues from Github');
Expand Down Expand Up @@ -68,15 +68,14 @@ const run = function () {

console.log('Found tag of previous StagingDeployCash:', previousStagingDeployCashData.tag);

// Find the list of PRs merged between the last StagingDeployCash and the new version
const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, newVersion);
console.log(
'The following PRs have been merged between the previous StagingDeployCash and new version:',
mergedPRs,
);

if (shouldCreateNewStagingDeployCash) {
// We're in the create flow, not update
// Find the list of PRs merged between the last StagingDeployCash and the new version
const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, newVersion);
console.log(
'The following PRs have been merged between the previous StagingDeployCash and new version:',
mergedPRs,
);

// TODO: if there are open DeployBlockers and we are opening a new checklist,
// then we should close / remove the DeployBlockerCash label from those
return GithubUtils.generateStagingDeployCashBody(
Expand All @@ -99,6 +98,13 @@ const run = function () {
// If we aren't sent a tag, then use the existing tag
const tag = newVersion || currentStagingDeployCashData.tag;

// Find the list of PRs merged between the last StagingDeployCash and the new version
const mergedPRs = GitUtils.getPullRequestsMergedBetween(previousStagingDeployCashData.tag, tag);
console.log(
'The following PRs have been merged between the previous StagingDeployCash and new version:',
mergedPRs,
);

// Generate the PR list, preserving the previous state of `isVerified` for existing PRs
const PRList = _.sortBy(
_.unique(
Expand Down Expand Up @@ -410,26 +416,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/getMergeCommitForPullRequest/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,26 +316,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/getReleaseBody/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,26 +259,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/isPullRequestMergeable/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,26 +262,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/isStagingDeployLocked/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,26 +240,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/markPullRequestsAsDeployed/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,26 +392,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/reopenIssueWithComment/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,26 +251,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/triggerWorkflowAndWait/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,26 +402,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down
17 changes: 2 additions & 15 deletions .github/libs/GithubUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,26 +200,13 @@ class GithubUtils {
deployBlockers = [],
resolvedDeployBlockers = [],
) {
return this.octokit.paginate(this.octokit.pulls.list, {
owner: GITHUB_OWNER,
repo: EXPENSIFY_CASH_REPO,
state: 'all',
sort: 'created',
direction: 'desc',
per_page: 100,
}, ({data}, done) => {
// PRList is reverse-chronologically ordered
const oldestMergedPR = _.last(PRList);
if (_.find(data, pr => pr.html_url === oldestMergedPR)) {
done();
}
return data;
})
return this.fetchAllPullRequests(_.map(PRList, this.getPullRequestNumberFromURL))
.then((data) => {
const automatedPRs = _.pluck(
_.filter(data, GithubUtils.isAutomatedPullRequest),
'html_url',
);
console.log('Filtering out the following automated pull requests:', automatedPRs);
const sortedPRList = _.chain(PRList)
.difference(automatedPRs)
.unique()
Expand Down