Skip to content

🍒 Cherry pick PR #12754 to staging 🍒 #12764

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

Merged
OSBotify merged 2 commits into from
Nov 16, 2022
Merged

🍒 Cherry pick PR #12754 to staging 🍒 #12764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c479152
Merge pull request #12763 from Expensify/version-BUILD-5E2710BE-38D9-…
OSBotify Nov 16, 2022
dc885ec
Merge pull request #12754 from Expensify/Rory-SmarterNoQARegex
Nov 16, 2022
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
2 changes: 1 addition & 1 deletion .github/actions/javascript/authorChecklist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/awaitStagingDeploys/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/checkDeployBlockers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/createOrUpdateStagingDeploy/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/getDeployPullRequestList/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/getPullRequestDetails/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/getReleaseBody/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/isPullRequestMergeable/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/isStagingDeployLocked/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/markPullRequestsAsDeployed/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/reopenIssueWithComment/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/reviewerChecklist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/triggerWorkflowAndWait/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/javascript/verifySignedCommits/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
2 changes: 1 addition & 1 deletion .github/libs/GithubUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ class GithubUtils {
console.log('Found the following Internal QA PRs:', internalQAPRMap);

const noQAPRs = _.pluck(
_.filter(data, PR => (PR.title || '').toUpperCase().startsWith('[NO QA]')),
_.filter(data, PR => /\[No\s?QA]/i.test(PR.title)),
'html_url',
);
console.log('Found the following NO QA PRs:', noQAPRs);
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001022800
versionName "1.2.28-0"
versionCode 1001022801
versionName "1.2.28-1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.2.28.0</string>
<string>1.2.28.1</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.2.28.0</string>
<string>1.2.28.1</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.2.28-0",
"version": "1.2.28-1",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/GithubUtilsTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,14 +290,14 @@ describe('GithubUtils', () => {
},
{
number: 5,
title: '[No QA] Test No QA PR uppercase',
title: '[NO QA] Test No QA PR uppercase',
html_url: 'https://github.com/Expensify/App/pull/5',
user: {login: 'testUser'},
labels: [],
},
{
number: 6,
title: '[No QA] Test No QA PR Title Case',
title: '[NoQa] Test No QA PR Title Case',
html_url: 'https://github.com/Expensify/App/pull/6',
user: {login: 'testUser'},
labels: [],
Expand Down