Skip to content

Commit

Permalink
fix: resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@koko57
koko57 committed Jul 29, 2024
2 parents aa8a69a + 98d8a5a commit 47aa341
Show file tree
Hide file tree
Showing 130 changed files with 28,617 additions and 744 deletions.
1 change: 1 addition & 0 deletions .github/.eslintrc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ module.exports = {
'@lwc/lwc/no-async-await': 'off',
'no-await-in-loop': 'off',
'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
'no-continue': 'off',
},
};
23 changes: 17 additions & 6 deletions .github/actions/javascript/authorChecklist/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17016,14 +17016,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down Expand Up @@ -17400,12 +17417,6 @@ class GithubUtils {
})
.then((response) => response.data.workflow_runs[0]?.id);
}
/**
* Generate the well-formatted body of a production release.
*/
static getReleaseBody(pullRequests) {
return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
}
/**
* Generate the URL of an New Expensify pull request given the PR number.
*/
Expand Down
23 changes: 17 additions & 6 deletions .github/actions/javascript/awaitStagingDeploys/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12257,14 +12257,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down Expand Up @@ -12641,12 +12658,6 @@ class GithubUtils {
})
.then((response) => response.data.workflow_runs[0]?.id);
}
/**
* Generate the well-formatted body of a production release.
*/
static getReleaseBody(pullRequests) {
return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
}
/**
* Generate the URL of an New Expensify pull request given the PR number.
*/
Expand Down
23 changes: 17 additions & 6 deletions .github/actions/javascript/checkDeployBlockers/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11540,14 +11540,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down Expand Up @@ -11924,12 +11941,6 @@ class GithubUtils {
})
.then((response) => response.data.workflow_runs[0]?.id);
}
/**
* Generate the well-formatted body of a production release.
*/
static getReleaseBody(pullRequests) {
return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
}
/**
* Generate the URL of an New Expensify pull request given the PR number.
*/
Expand Down
23 changes: 17 additions & 6 deletions .github/actions/javascript/createOrUpdateStagingDeploy/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14352,14 +14352,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down Expand Up @@ -14954,12 +14971,6 @@ class GithubUtils {
})
.then((response) => response.data.workflow_runs[0]?.id);
}
/**
* Generate the well-formatted body of a production release.
*/
static getReleaseBody(pullRequests) {
return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
}
/**
* Generate the URL of an New Expensify pull request given the PR number.
*/
Expand Down
23 changes: 17 additions & 6 deletions .github/actions/javascript/getArtifactInfo/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11501,14 +11501,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down Expand Up @@ -11885,12 +11902,6 @@ class GithubUtils {
})
.then((response) => response.data.workflow_runs[0]?.id);
}
/**
* Generate the well-formatted body of a production release.
*/
static getReleaseBody(pullRequests) {
return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
}
/**
* Generate the URL of an New Expensify pull request given the PR number.
*/
Expand Down
7 changes: 6 additions & 1 deletion .github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,15 @@ async function run() {
})
).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success')
) {
console.log(`Deploy was not a success: ${lastSuccessfulDeploy.html_url}, looking at the next one`);
lastSuccessfulDeploy = completedDeploys.shift();
}

const priorTag = completedDeploys[0].head_branch;
if (!lastSuccessfulDeploy) {
throw new Error('Could not find a prior successful deploy');
}

const priorTag = lastSuccessfulDeploy.head_branch;
console.log(`Looking for PRs deployed to ${deployEnv} between ${priorTag} and ${inputTag}`);
const prList = await GitUtils.getPullRequestsMergedBetween(priorTag ?? '', inputTag);
console.log('Found the pull request list: ', prList);
Expand Down
29 changes: 22 additions & 7 deletions .github/actions/javascript/getDeployPullRequestList/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11529,9 +11529,13 @@ async function run() {
run_id: lastSuccessfulDeploy.id,
filter: 'latest',
})).data.jobs.some((job) => job.name.startsWith('Build and deploy') && job.conclusion === 'success')) {
console.log(`Deploy was not a success: ${lastSuccessfulDeploy.html_url}, looking at the next one`);
lastSuccessfulDeploy = completedDeploys.shift();
}
const priorTag = completedDeploys[0].head_branch;
if (!lastSuccessfulDeploy) {
throw new Error('Could not find a prior successful deploy');
}
const priorTag = lastSuccessfulDeploy.head_branch;
console.log(`Looking for PRs deployed to ${deployEnv} between ${priorTag} and ${inputTag}`);
const prList = await GitUtils_1.default.getPullRequestsMergedBetween(priorTag ?? '', inputTag);
console.log('Found the pull request list: ', prList);
Expand Down Expand Up @@ -11631,14 +11635,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down Expand Up @@ -12233,12 +12254,6 @@ class GithubUtils {
})
.then((response) => response.data.workflow_runs[0]?.id);
}
/**
* Generate the well-formatted body of a production release.
*/
static getReleaseBody(pullRequests) {
return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
}
/**
* Generate the URL of an New Expensify pull request given the PR number.
*/
Expand Down
17 changes: 17 additions & 0 deletions .github/actions/javascript/getPreviousVersion/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2768,14 +2768,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down
23 changes: 17 additions & 6 deletions .github/actions/javascript/getPullRequestDetails/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11603,14 +11603,31 @@ const CONST = {
STAGING_DEPLOY: 'StagingDeployCash',
DEPLOY_BLOCKER: 'DeployBlockerCash',
INTERNAL_QA: 'InternalQA',
HELP_WANTED: 'Help Wanted',
},
ACTIONS: {
CREATED: 'created',
EDIT: 'edited',
},
EVENTS: {
ISSUE_COMMENT: 'issue_comment',
},
OPENAI_ROLES: {
USER: 'user',
ASSISTANT: 'assistant',
},
PROPOSAL_KEYWORD: 'Proposal',
OPENAI_THREAD_COMPLETED: 'completed',
DATE_FORMAT_STRING: 'yyyy-MM-dd',
PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
POLL_RATE: 10000,
APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
NO_ACTION: 'NO_ACTION',
OPENAI_POLL_RATE: 1500,
OPENAI_POLL_TIMEOUT: 90000,
};
exports["default"] = CONST;

Expand Down Expand Up @@ -11987,12 +12004,6 @@ class GithubUtils {
})
.then((response) => response.data.workflow_runs[0]?.id);
}
/**
* Generate the well-formatted body of a production release.
*/
static getReleaseBody(pullRequests) {
return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
}
/**
* Generate the URL of an New Expensify pull request given the PR number.
*/
Expand Down
Loading

0 comments on commit 47aa341

Please sign in to comment.