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

Merge staging into master #249

Merged
merged 59 commits into from Nov 21, 2018
Merged

Merge staging into master #249

merged 59 commits into from Nov 21, 2018

Conversation

@darkdh
Copy link
Member

darkdh commented Nov 20, 2018

branch generated by

  1. forking current staging branch
  2. push a commit to prevent changing .travis.xml for production
  3. rebase against current master
@darkdh darkdh self-assigned this Nov 20, 2018
@darkdh darkdh requested review from diracdeltas and SergeyZhukovsky Nov 20, 2018
SergeyZhukovsky and others added 27 commits Oct 12, 2017
To prevent users from mucking with each others' data
update electron
run npm update
update to browserify 16.x
rebuild proto lib
update to raven 2.x
remove flow check since it is causing travis to timeout
This reverts commit 09780d2.
* Resolve promise on set bucket notification configuration
* Make sync client an NPM package

Fix #199
SergeyZhukovsky and others added 8 commits Oct 17, 2018
Resolves #233
successfully
…than approximate number of messages
Generate package-lock.json by
1. modifying package.json in browser-launcher to have merge dep "^1.2.1"
2. delete merge folder in node_modules
3. npm install
4. make sure we have modified packge-lock.json
5. rm entire node_modules
6. do npm install and make sure we install merge version >= 1.2.1
7. npm audit should have no errors now
@darkdh darkdh force-pushed the staging-to-master branch from b88e9c8 to 7b38235 Nov 20, 2018
@diracdeltas
Copy link
Member

diracdeltas commented Nov 20, 2018

FYI if you are going to do a sync release, there needs to be a version bump: #190

@darkdh
Copy link
Member Author

darkdh commented Nov 20, 2018

@yan do you know why travis is stuck in infinite npm run flow?

@@ -0,0 +1,19 @@
{
"name": "@brave/sync-client",
"version": "0.1.0",

This comment has been minimized.

Copy link
@diracdeltas

diracdeltas Nov 20, 2018

Member

i don't remember if there are any clients currently using this NPM package (as opposed to downloading sync bundle from github releases). if so i can publish an update.

@diracdeltas
Copy link
Member

diracdeltas commented Nov 20, 2018

@darkdh i remember seeing that; we don't really use flow in a useful way so we can just exclude that from travis

@darkdh darkdh force-pushed the staging-to-master branch from 7b38235 to 2e60ccd Nov 20, 2018
darkdh added a commit that referenced this pull request Nov 20, 2018
Also exclude flow in travis
#249 (comment)
update to sync v1.4.3
@darkdh darkdh force-pushed the staging-to-master branch from 2e60ccd to 7eda86f Nov 20, 2018
darkdh added a commit that referenced this pull request Nov 20, 2018
Also exclude flow in travis
#249 (comment)
@darkdh
Copy link
Member Author

darkdh commented Nov 20, 2018

There are two tests failed

@diracdeltas
Copy link
Member

diracdeltas commented Nov 20, 2018

@darkdh probably needs new AWS credentials; see https://github.com/brave/sync/pull/210/files

@evq or someone in #devops can help you get the new credentials

@darkdh darkdh force-pushed the staging-to-master branch from 7eda86f to 2bdde46 Nov 20, 2018
darkdh added a commit that referenced this pull request Nov 20, 2018
Also update access_key_id_production and secret_access_key_production
And exclude flow in travis
#249 (comment)
Also update access_key_id_production and secret_access_key_production
And exclude flow in travis
#249 (comment)
@darkdh darkdh force-pushed the staging-to-master branch from 2bdde46 to 90b37d7 Nov 20, 2018
Copy link
Member

SergeyZhukovsky left a comment

++

@darkdh darkdh merged commit f5e1d26 into master Nov 21, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@darkdh darkdh deleted the staging-to-master branch Oct 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.