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.

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

Update version to 1.0.2-62 on staging #1823

Closed
wants to merge 154 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
ae15b86
Remove githubusername page, github username checks, and canAccessExep…
stitesExpensify Feb 9, 2021
c0ac878
Merge branch 'master' of github.com:Expensify/Expensify.cash into sti…
stitesExpensify Mar 10, 2021
c48b795
Fix bad merge
stitesExpensify Mar 10, 2021
9ea977e
Update copy for home page
stitesExpensify Mar 11, 2021
d34d7fe
Remove unused imports
stitesExpensify Mar 11, 2021
ae9f4ca
Use escaped apostrophe instead of putting it in brackets
stitesExpensify Mar 12, 2021
a6408b4
Add Payments View in User Settings
Shailesh351 Mar 12, 2021
960d1c3
Use setPaypalAccount fn onPress of Add Paypal Account Button
Shailesh351 Mar 12, 2021
979cd5c
Reorder imports
Shailesh351 Mar 12, 2021
650037f
Update Styles
Shailesh351 Mar 12, 2021
e3055c7
Write deploy blocker action
AndrewGable Mar 12, 2021
e49e892
Add test and write logic for no tag
AndrewGable Mar 12, 2021
8c3ee70
Start to add action test
AndrewGable Mar 13, 2021
03e407d
Undo tests for now
AndrewGable Mar 13, 2021
fc3ee60
Rebuild actions
AndrewGable Mar 13, 2021
5f38ab7
Use correct url
AndrewGable Mar 13, 2021
e5556fb
Merge pull request #1758 from Expensify/andrew-deploy-blocker
roryabraham Mar 13, 2021
e2caf8c
Use NEW_DEPLOY_BLOCKERS instead of NEW_PULL_REQUESTS
AndrewGable Mar 13, 2021
824931c
Merge pull request #1761 from Expensify/andrew-fix-bugs
roryabraham Mar 13, 2021
9d94d30
Remove duplicate branch bug for staging
AndrewGable Mar 13, 2021
7ce61f4
Merge pull request #1763 from Expensify/andrew-duplicate-branch
roryabraham Mar 13, 2021
9267a99
Update version to 1.0.2-49
Mar 13, 2021
815d13d
Merge pull request #1764 from Expensify/version-bump-7ce61f4a790eb733…
github-actions[bot] Mar 13, 2021
05e5409
Merge branch 'master' into sb_add_payments
Shailesh351 Mar 13, 2021
412e7a1
Remove unnecessary styling
Shailesh351 Mar 13, 2021
4cee4a4
Update src/pages/settings/PaymentsPage.js
Shailesh351 Mar 15, 2021
f44b2d0
Update src/pages/settings/PaymentsPage.js
Shailesh351 Mar 15, 2021
757f207
revert close button prop name
Julesssss Mar 15, 2021
759e01f
wrap IOU pages with ScreenWrapper, to fix status-bar margin and match…
Julesssss Mar 15, 2021
3f89023
fixed jslint issues
Julesssss Mar 15, 2021
a7179a6
Merge pull request #1771 from Expensify/jules-fixIOUModalNavigation
flodnv Mar 15, 2021
348ead3
Update src/pages/settings/PaymentsPage.js
Shailesh351 Mar 15, 2021
ee93292
Update version to 1.0.2-50
Mar 15, 2021
eab8028
Update src/pages/settings/PaymentsPage.js
Shailesh351 Mar 15, 2021
41ccd25
Merge pull request #1772 from Expensify/version-bump-a7179a6f5be0b501…
github-actions[bot] Mar 15, 2021
2a9e5db
Rename Varible and fn Name
Shailesh351 Mar 15, 2021
b56f891
Merge pull request #1739 from Shailesh351/sb_add_payments
Mar 15, 2021
18e868c
Update version to 1.0.2-51
Mar 15, 2021
9958a3b
Merge pull request #1773 from Expensify/version-bump-b56f89138f57fef7…
github-actions[bot] Mar 15, 2021
dbb7932
Merge pull request #1444 from Expensify/stites-removeGithubRequirement
tgolen Mar 15, 2021
ee08d6b
Update version to 1.0.2-52
Mar 15, 2021
c816a13
Merge pull request #1775 from Expensify/version-bump-dbb7932748c733ec…
github-actions[bot] Mar 15, 2021
f033426
Set modal visibility to false when modal dismissed
Beamanator Mar 15, 2021
73d6a7b
Getting closer to mocking everything up on tests
AndrewGable Mar 15, 2021
188ad0a
Fix clientEvents that are causing reconnection attempts
marcaaron Mar 15, 2021
67e7c82
Finally figure out mocks
AndrewGable Mar 15, 2021
ea665b5
Comments and clean up 🧹
AndrewGable Mar 15, 2021
7743763
Move setModalVisible to BaseModal's componentWillUnmount
Beamanator Mar 15, 2021
28cf905
Only update lastMessageText from pusher event
tgolen Mar 15, 2021
afadfca
Make deployStaging a separate job in preDeploy workflow
roryabraham Mar 15, 2021
845099b
Darken FAB colors when closed
Beamanator Mar 15, 2021
ba4ec40
Fix step title
roryabraham Mar 15, 2021
f9705ad
Create PR from master to staging
roryabraham Mar 15, 2021
c2bb293
Merge pull request #1779 from Expensify/andrew-lock-test
AndrewGable Mar 15, 2021
f6c5d2b
Improve comments
AndrewGable Mar 15, 2021
92c5fbc
Remove deploy steps and move failure notification to just the one job
roryabraham Mar 15, 2021
1644486
Rebuild actions
AndrewGable Mar 15, 2021
188a8c3
Create deploy workflow
roryabraham Mar 15, 2021
dc0f1a6
Skip version job for automerge PRs and checkout correct branches in d…
roryabraham Mar 15, 2021
b587845
Create getCurrentAppVersion action
roryabraham Mar 15, 2021
f728a2e
Use getCurrentAppVersion in deploy worklfow
roryabraham Mar 15, 2021
606bd77
Merge pull request #1784 from Expensify/andrew-test-lock
roryabraham Mar 15, 2021
f5e7b9f
Move modal hide and key-listener cleanup to new fn
Beamanator Mar 15, 2021
51d03c8
Merge pull request #1777 from Expensify/marcaaron-fixPusherClientEvents
Mar 15, 2021
d629cde
add check for mergeability
attaradev Mar 16, 2021
e4eff6c
add check for mergeable state
attaradev Mar 16, 2021
9fec61f
Merge pull request #1787 from mikeattara/master
robertjchen Mar 16, 2021
838cc90
Update version to 1.0.2-53
Mar 16, 2021
88c1e72
Merge pull request #1789 from Expensify/version-bump-9fec61f5240ff143…
github-actions[bot] Mar 16, 2021
90c81f8
Update variable name and DRY up some logic
tgolen Mar 16, 2021
0887ec7
Remove unnecessary GITHUB_TOKEN input
roryabraham Mar 16, 2021
2ca2f30
remove unnecessary parens
roryabraham Mar 16, 2021
38f4c9d
Fix multiline if
roryabraham Mar 16, 2021
613f3ca
Use print-version instead of custom action
roryabraham Mar 16, 2021
a1f200c
Checkout repo in updateStaging job
roryabraham Mar 16, 2021
8c67b9b
Don't comment on deferred PRs for versionBumpPRs
roryabraham Mar 16, 2021
acaa3dd
Update expensify-common hash
Mar 16, 2021
c3bbbc8
Merge pull request #1783 from Expensify/beaman-darkenCloseButton
stitesExpensify Mar 16, 2021
a5e4cf9
Merge pull request #1780 from Expensify/beaman-focusComposeWhenModalD…
stitesExpensify Mar 16, 2021
2a65785
Update version to 1.0.2-54
Mar 16, 2021
987e62e
Merge pull request #1792 from Expensify/version-bump-c3bbbc878d6bae5f…
github-actions[bot] Mar 16, 2021
88b5919
Update version to 1.0.2-55
Mar 16, 2021
b517967
Merge pull request #1793 from Expensify/version-bump-a5e4cf9286794293…
github-actions[bot] Mar 16, 2021
c2b7755
Merge pull request #1782 from Expensify/Rory-KeepStagingUpToDate
AndrewGable Mar 16, 2021
648fb74
Fix typo in contains
roryabraham Mar 16, 2021
e285e1e
Merge pull request #1794 from Expensify/Rory-FixTypoInContains
AndrewGable Mar 16, 2021
60ea6fc
Fix another typo in contains
roryabraham Mar 16, 2021
8c70481
Fix contains usage in another workflow too
roryabraham Mar 16, 2021
c256ccc
Merge pull request #1795 from Expensify/Rory-FixStringArgInContains
AndrewGable Mar 16, 2021
301570f
Treat ::set-output outputs as booleans not strings
roryabraham Mar 16, 2021
6971d9b
Add better logging in isStagingDeployLocked
roryabraham Mar 16, 2021
ac813fa
Merge pull request #1781 from Expensify/tgolen-fix-lhn-sync
marcaaron Mar 16, 2021
206aa37
Give step ID
roryabraham Mar 16, 2021
e7c3c93
Go back to treating output as string
roryabraham Mar 16, 2021
4ccfd46
And also in deploy workflow
roryabraham Mar 16, 2021
b078fc6
Fix output syntax in skipDeploy if
roryabraham Mar 16, 2021
b817196
Update StagingDeployCash in version job and use correct version in st…
roryabraham Mar 16, 2021
e681bf0
Merge pull request #1797 from Expensify/Rory-TreatSetOutputAsBooleanN…
AndrewGable Mar 16, 2021
996fd8c
Update version to 1.0.2-56
Mar 16, 2021
12affd9
Merge pull request #1800 from Expensify/version-bump-e681bf0a57d5586c…
github-actions[bot] Mar 16, 2021
b74286e
Merge pull request #1791 from Expensify/amechler-link-inside-link
Mar 16, 2021
427572f
Set up two more jobs to handle staging and production cases
AndrewGable Mar 16, 2021
aeba3bf
Don't run PR tests on master, staging, or prod
AndrewGable Mar 16, 2021
60ca602
Add github.event prefix
AndrewGable Mar 16, 2021
067c465
Two more github.event.
AndrewGable Mar 16, 2021
4754807
Copy 05d3685
AndrewGable Mar 16, 2021
18dc66e
Set staging version to fix bug
AndrewGable Mar 16, 2021
2421e52
Skip version commits with message and run actions on master
AndrewGable Mar 16, 2021
0647c36
Apply peer review comments
AndrewGable Mar 16, 2021
eeaf5c7
Merge pull request #1802 from Expensify/andrew-auto-merge-staging
roryabraham Mar 16, 2021
25feb24
Create dummy PR to retest deploys
roryabraham Mar 16, 2021
4d29b67
Merge pull request #1804 from Expensify/Rory-DummyPR
AndrewGable Mar 16, 2021
693d75f
Don't skip all actions on version update PRs, because it also skips a…
roryabraham Mar 16, 2021
54599a2
Merge pull request #1806 from Expensify/Rory-DontSkipAutomerge
Jag96 Mar 16, 2021
844ae7f
Update version to 1.0.2-57
Mar 16, 2021
bc8c1f8
Merge pull request #1807 from Expensify/version-bump-54599a22de782675…
github-actions[bot] Mar 16, 2021
238ac14
Don't run CLA workflow twice
Jag96 Mar 16, 2021
63f156a
Make OSBotify perform the automerge
roryabraham Mar 16, 2021
99b4493
Add escape hatch so we don't use up all our versions
roryabraham Mar 16, 2021
b574d21
Merge pull request #1809 from Expensify/Rory-OSBotifyMerges
Jag96 Mar 16, 2021
54b993d
Use workflow if instead of bash if
roryabraham Mar 16, 2021
f889917
Add closing '
roryabraham Mar 16, 2021
93e4d15
Merge pull request #1810 from Expensify/Rory-FixPreDeploySafeguard
Jag96 Mar 17, 2021
61238e4
Update version to 1.0.2-58
Mar 17, 2021
e414c88
Merge pull request #1811 from Expensify/version-bump-93e4d157913ec31c…
OSBotify Mar 17, 2021
f03fbc5
Remove wildcard array mapping of label to name
roryabraham Mar 17, 2021
513ef2c
Also remove wildcard syntax in deploy workflow
roryabraham Mar 17, 2021
abbb702
Merge pull request #1812 from Expensify/Rory-CheckLabelWithoutWildcar…
Jag96 Mar 17, 2021
f0a1893
Update version to 1.0.2-59
Mar 17, 2021
735c2bc
Merge pull request #1813 from Expensify/version-bump-abbb702ed08ff888…
OSBotify Mar 17, 2021
8765c1d
upadte branches-ignore syntax, add logging for workflows
Jag96 Mar 17, 2021
b59ed4e
Merge branch 'master' into joe-prevent-duplicate-cla
Jag96 Mar 17, 2021
ca83889
remove failsafe
Jag96 Mar 17, 2021
cc0214d
fix run syntax
Jag96 Mar 17, 2021
ec90183
Merge pull request #1808 from Expensify/joe-prevent-duplicate-cla
roryabraham Mar 17, 2021
5225d2d
Update version to 1.0.2-60
Mar 17, 2021
9b80316
Merge pull request #1815 from Expensify/version-bump-ec90183a2b1444fa…
OSBotify Mar 17, 2021
182e0f2
Skip CLA for staging and production PRs
roryabraham Mar 17, 2021
ea09fa0
Skip CLA if pr author is OSBotify
roryabraham Mar 17, 2021
9d99880
Update comment
roryabraham Mar 17, 2021
77c0637
Merge pull request #1816 from Expensify/Rory-SkipCLAForStaging
Jag96 Mar 17, 2021
e400e2f
Add emojis for dummy PR
roryabraham Mar 17, 2021
4623704
Rebuild GH actions
roryabraham Mar 17, 2021
23ef4c3
Merge pull request #1817 from Expensify/Rory-RetestDeploy
Jag96 Mar 17, 2021
3e6352a
Update version to 1.0.2-61
Mar 17, 2021
97a3429
Merge pull request #1818 from Expensify/version-bump-23ef4c3845a7c873…
OSBotify Mar 17, 2021
9e2c7c4
Echo cla actor
roryabraham Mar 17, 2021
7adbd38
Wrap CLA conditional in {{ }}
roryabraham Mar 17, 2021
9c81dfa
Add TODO comment
roryabraham Mar 17, 2021
3466c37
Merge pull request #1821 from Expensify/Rory-TestCLAActor
Jag96 Mar 17, 2021
75484d4
Update version to 1.0.2-62
Mar 17, 2021
1280485
Merge pull request #1822 from Expensify/version-bump-3466c3784c14995d…
OSBotify Mar 17, 2021
34858c4
Don't require clean mergeable state
roryabraham Mar 17, 2021
fa59966
Merge pull request #1824 from Expensify/Rory-DontRequireCleanMergeabl…
Jag96 Mar 17, 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
108 changes: 59 additions & 49 deletions .github/actions/bumpVersion/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@ function _objectWithoutProperties(source, excluded) {
return target;
}

const VERSION = "3.2.4";
const VERSION = "3.3.1";

class Octokit {
constructor(options = {}) {
Expand All @@ -1638,6 +1638,7 @@ class Octokit {
baseUrl: request.request.endpoint.DEFAULTS.baseUrl,
headers: {},
request: Object.assign({}, options.request, {
// @ts-ignore internal usage only, no need to type
hook: hook.bind(null, "request")
}),
mediaType: {
Expand Down Expand Up @@ -2133,7 +2134,7 @@ function withDefaults(oldDefaults, newDefaults) {
});
}

const VERSION = "6.0.10";
const VERSION = "6.0.11";

const userAgent = `octokit-endpoint.js/${VERSION} ${universalUserAgent.getUserAgent()}`; // DEFAULTS has all properties set that EndpointOptions has, except url.
// So we use RequestParameters and add method as additional required property.
Expand Down Expand Up @@ -2216,7 +2217,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
var request = __nccwpck_require__(6234);
var universalUserAgent = __nccwpck_require__(5030);

const VERSION = "4.5.8";
const VERSION = "4.6.1";

class GraphqlError extends Error {
constructor(request, response) {
Expand All @@ -2239,10 +2240,18 @@ class GraphqlError extends Error {
}

const NON_VARIABLE_OPTIONS = ["method", "baseUrl", "url", "headers", "request", "query", "mediaType"];
const FORBIDDEN_VARIABLE_OPTIONS = ["query", "method", "url"];
const GHES_V3_SUFFIX_REGEX = /\/api\/v3\/?$/;
function graphql(request, query, options) {
if (typeof query === "string" && options && "query" in options) {
return Promise.reject(new Error(`[@octokit/graphql] "query" cannot be used as variable name`));
if (options) {
if (typeof query === "string" && "query" in options) {
return Promise.reject(new Error(`[@octokit/graphql] "query" cannot be used as variable name`));
}

for (const key in options) {
if (!FORBIDDEN_VARIABLE_OPTIONS.includes(key)) continue;
return Promise.reject(new Error(`[@octokit/graphql] "${key}" cannot be used as variable name`));
}
}

const parsedOptions = typeof query === "string" ? Object.assign({
Expand Down Expand Up @@ -3713,7 +3722,7 @@ var isPlainObject = __nccwpck_require__(9062);
var nodeFetch = _interopDefault(__nccwpck_require__(467));
var requestError = __nccwpck_require__(537);

const VERSION = "5.4.12";
const VERSION = "5.4.14";

function getBufferResponse(response) {
return response.arrayBuffer();
Expand Down Expand Up @@ -3966,51 +3975,51 @@ module.exports.Collection = Hook.Collection
/***/ 5549:
/***/ ((module) => {

module.exports = addHook
module.exports = addHook;

function addHook (state, kind, name, hook) {
var orig = hook
function addHook(state, kind, name, hook) {
var orig = hook;
if (!state.registry[name]) {
state.registry[name] = []
state.registry[name] = [];
}

if (kind === 'before') {
if (kind === "before") {
hook = function (method, options) {
return Promise.resolve()
.then(orig.bind(null, options))
.then(method.bind(null, options))
}
.then(method.bind(null, options));
};
}

if (kind === 'after') {
if (kind === "after") {
hook = function (method, options) {
var result
var result;
return Promise.resolve()
.then(method.bind(null, options))
.then(function (result_) {
result = result_
return orig(result, options)
result = result_;
return orig(result, options);
})
.then(function () {
return result
})
}
return result;
});
};
}

if (kind === 'error') {
if (kind === "error") {
hook = function (method, options) {
return Promise.resolve()
.then(method.bind(null, options))
.catch(function (error) {
return orig(error, options)
})
}
return orig(error, options);
});
};
}

state.registry[name].push({
hook: hook,
orig: orig
})
orig: orig,
});
}


Expand All @@ -4019,33 +4028,32 @@ function addHook (state, kind, name, hook) {
/***/ 4670:
/***/ ((module) => {

module.exports = register
module.exports = register;

function register (state, name, method, options) {
if (typeof method !== 'function') {
throw new Error('method for before hook must be a function')
function register(state, name, method, options) {
if (typeof method !== "function") {
throw new Error("method for before hook must be a function");
}

if (!options) {
options = {}
options = {};
}

if (Array.isArray(name)) {
return name.reverse().reduce(function (callback, name) {
return register.bind(null, state, name, callback, options)
}, method)()
return register.bind(null, state, name, callback, options);
}, method)();
}

return Promise.resolve()
.then(function () {
if (!state.registry[name]) {
return method(options)
}
return Promise.resolve().then(function () {
if (!state.registry[name]) {
return method(options);
}

return (state.registry[name]).reduce(function (method, registered) {
return registered.hook.bind(null, method, options)
}, method)()
})
return state.registry[name].reduce(function (method, registered) {
return registered.hook.bind(null, method, options);
}, method)();
});
}


Expand All @@ -4054,22 +4062,24 @@ function register (state, name, method, options) {
/***/ 6819:
/***/ ((module) => {

module.exports = removeHook
module.exports = removeHook;

function removeHook (state, name, method) {
function removeHook(state, name, method) {
if (!state.registry[name]) {
return
return;
}

var index = state.registry[name]
.map(function (registered) { return registered.orig })
.indexOf(method)
.map(function (registered) {
return registered.orig;
})
.indexOf(method);

if (index === -1) {
return
return;
}

state.registry[name].splice(index, 1)
state.registry[name].splice(index, 1);
}


Expand Down
6 changes: 3 additions & 3 deletions .github/actions/createOrUpdateStagingDeploy/action.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: 'Create or Update StagingDeployCash'
description: 'Creates a new StagingDeployCash issue if there is not one open, or updates the existing one.'
inputs:
NPM_VERSION:
description: The new NPM version of the StagingDeployCash issue.
required: true
GITHUB_TOKEN:
description: Auth token for Expensify.cash Github
required: true
NPM_VERSION:
description: The new NPM version of the StagingDeployCash issue.
required: false
NEW_PULL_REQUESTS:
description: A comma-separated list of pull request URLs to add to the open StagingDeployCash issue.
required: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const moment = require('moment');
const GithubUtils = require('../../libs/GithubUtils');
const GitUtils = require('../../libs/GitUtils');

const newVersion = core.getInput('NPM_VERSION', {required: true});
const newVersion = core.getInput('NPM_VERSION');
const octokit = github.getOctokit(core.getInput('GITHUB_TOKEN', {required: true}));
const githubUtils = new GithubUtils(octokit);

Expand Down Expand Up @@ -42,8 +42,8 @@ githubUtils.getStagingDeployCash()

// Unexpected error!
console.error('Unexpected error occurred finding the StagingDeployCash!'
+ ' There may have been more than one open StagingDeployCash found,'
+ ' or there was some other problem with the Github API request.', err);
+ ' There may have been more than one open StagingDeployCash found,'
+ ' or there was some other problem with the Github API request.', err);
core.setFailed(err);
})
.then((githubResponse) => {
Expand Down
Loading