Skip to content

Conversation

rueckstiess
Copy link
Contributor

⚠️ Don't merge this yet, WIP.

@matt-d-rat
Copy link
Contributor

Fingers crossed this fixes the build. LGTM 👍

@rueckstiess
Copy link
Contributor Author

  keytar
    ✓ should be requirable

@rueckstiess
Copy link
Contributor Author

Build is green, merging in.

@rueckstiess rueckstiess merged commit 3b648b6 into master Sep 11, 2017
@rueckstiess rueckstiess deleted the travis-add-libsecret branch September 11, 2017 04:19
pzrq pushed a commit that referenced this pull request Sep 22, 2017
pzrq pushed a commit that referenced this pull request Sep 22, 2017
pzrq added a commit that referenced this pull request Sep 22, 2017
…1243)

* [Backport 1.9] COMPASS-1217 bump runner and remove .travis.yml hack (#1242)

* ⬆️ mongodb-runner@3.6.1

* :yay: Remove hack to workaround Travis caches issues

* ⬆️ npm@5

* 📌 react-select@1.0.0-rc.5

Indexes Tab does not even appear with react-select@1.0.0-rc6:
https://github.com/JedWatson/react-select/blob/master/HISTORY.md#v100-rc6--2017-09-10

* Sanity check npm 5 is installed at least once

* ⬆️ chai-enzyme@0.8.0, replace react-addons-test-utils with react-test-renderer

When running `npm test -- --enzyme`, fixes the following warnings:
Warning: ReactTestUtils has been moved to react-dom/test-utils. Update references to remove this warning.
Warning: Shallow renderer has been moved to react-test-renderer/shallow. Update references to remove this warning.

* add libsecret-1-0 to travis config (#1237)
pzrq added a commit that referenced this pull request Sep 22, 2017
…1244)

* [Backport 1.8] COMPASS-1217 bump runner and remove .travis.yml hack (#1242)

* ⬆️ mongodb-runner@3.6.1

* :yay: Remove hack to workaround Travis caches issues

* ⬆️ npm@5

* 📌 react-select@1.0.0-rc.5

Indexes Tab does not even appear with react-select@1.0.0-rc6:
https://github.com/JedWatson/react-select/blob/master/HISTORY.md#v100-rc6--2017-09-10

* Sanity check npm 5 is installed at least once

* ⬆️ chai-enzyme@0.8.0, replace react-addons-test-utils with react-test-renderer

When running `npm test -- --enzyme`, fixes the following warnings:
Warning: ReactTestUtils has been moved to react-dom/test-utils. Update references to remove this warning.
Warning: Shallow renderer has been moved to react-test-renderer/shallow. Update references to remove this warning.

* Go back to npm@4

* add libsecret-1-0 to travis config (#1237)

* 🐛 Resolve incorrectly resolved merge conflict

See 67e655e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants