Skip to content

Commit

Permalink
Merge branch 'main' into 17004-add-pressable-ESLint-rules
Browse files Browse the repository at this point in the history
  • Loading branch information
Skalakid committed Jun 26, 2023
2 parents 05912b4 + 64b720c commit 140e058
Show file tree
Hide file tree
Showing 72 changed files with 7,055 additions and 24,056 deletions.
5 changes: 5 additions & 0 deletions .github/actions/composite/setupGitForOSBotify/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,8 @@ runs:
git config commit.gpgsign true
git config user.name OSBotify
git config user.email [email protected]
- name: Enable debug logs for git
shell: bash
if: runner.debug == '1'
run: echo "GIT_TRACE=true" >> "$GITHUB_ENV"
145 changes: 0 additions & 145 deletions .github/actions/composite/updateProtectedBranch/action.yml

This file was deleted.

17 changes: 2 additions & 15 deletions .github/actions/javascript/authorChecklist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -340,9 +340,6 @@ class GithubUtils {
) {
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);

// The format of this map is following:
// {
// 'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
Expand All @@ -366,7 +363,7 @@ class GithubUtils {
console.log('Found the following NO QA PRs:', noQAPRs);
const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);

const sortedPRList = _.chain(PRList).difference(automatedPRs).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);

// Tag version and comparison URL
Expand Down Expand Up @@ -423,7 +420,7 @@ class GithubUtils {
issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
return issueBody;
})
.catch((err) => console.warn('Error generating StagingDeployCash issue body!', 'Automated PRs may not be properly filtered out. Continuing...', err));
.catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
}

/**
Expand Down Expand Up @@ -603,16 +600,6 @@ class GithubUtils {
return Number.parseInt(matches[1], 10);
}

/**
* Determine if a given pull request is an automated PR.
*
* @param {Object} pullRequest
* @returns {Boolean}
*/
static isAutomatedPullRequest(pullRequest) {
return _.isEqual(lodashGet(pullRequest, 'user.login', ''), CONST.OS_BOTIFY);
}

/**
* Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
*
Expand Down
17 changes: 2 additions & 15 deletions .github/actions/javascript/awaitStagingDeploys/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,6 @@ class GithubUtils {
) {
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);

// The format of this map is following:
// {
// 'https://github.com/Expensify/App/pull/9641': [ 'PauloGasparSv', 'kidroca' ],
Expand All @@ -404,7 +401,7 @@ class GithubUtils {
console.log('Found the following NO QA PRs:', noQAPRs);
const verifiedOrNoQAPRs = _.union(verifiedPRList, noQAPRs);

const sortedPRList = _.chain(PRList).difference(automatedPRs).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
const sortedPRList = _.chain(PRList).difference(_.keys(internalQAPRMap)).unique().sortBy(GithubUtils.getPullRequestNumberFromURL).value();
const sortedDeployBlockers = _.sortBy(_.unique(deployBlockers), GithubUtils.getIssueOrPullRequestNumberFromURL);

// Tag version and comparison URL
Expand Down Expand Up @@ -461,7 +458,7 @@ class GithubUtils {
issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
return issueBody;
})
.catch((err) => console.warn('Error generating StagingDeployCash issue body!', 'Automated PRs may not be properly filtered out. Continuing...', err));
.catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
}

/**
Expand Down Expand Up @@ -641,16 +638,6 @@ class GithubUtils {
return Number.parseInt(matches[1], 10);
}

/**
* Determine if a given pull request is an automated PR.
*
* @param {Object} pullRequest
* @returns {Boolean}
*/
static isAutomatedPullRequest(pullRequest) {
return _.isEqual(lodashGet(pullRequest, 'user.login', ''), CONST.OS_BOTIFY);
}

/**
* Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
*
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit 140e058

Please sign in to comment.