From 3ef95ee86836b4f44aec69c861ebcfb81525cdf2 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 13 Nov 2017 13:36:07 +0000 Subject: [PATCH 1/4] test --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fc5d0ab5e..c8d158bcd 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The demo application shows various Wikipedia articles converted to Markdown and To start it, type `demo-joplin`. -# Features +# Features - Mobile and command line applications. - Support notes, to-dos, tags and notebooks. @@ -368,4 +368,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From 57575b7f13cda27fa297407dfeef35d7d6b45c9b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 13 Nov 2017 14:05:49 +0000 Subject: [PATCH 2/4] Create .travis.yml --- .travis.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..dfa867037 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,27 @@ +matrix: + include: + - os: osx + osx_image: xcode9.0 + language: node_js + node_js: "8" + env: + - ELECTRON_CACHE=$HOME/.cache/electron + - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder + +cache: + directories: + - node_modules + - $HOME/.cache/electron + - $HOME/.cache/electron-builder + +script: + - cd ElectronClient/app + - npm install + - yarn dist + +before_cache: + - rm -rf $HOME/.cache/electron-builder/wine + +branches: + except: +- "/^v\\d+\\.\\d+\\.\\d+$/" From e4ea21271f244821118769f52284d8b1c4a61437 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 13 Nov 2017 14:08:32 +0000 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfa867037..357bf2b0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,7 @@ cache: - $HOME/.cache/electron-builder script: - - cd ElectronClient/app - - npm install - - yarn dist - -before_cache: - - rm -rf $HOME/.cache/electron-builder/wine - -branches: - except: -- "/^v\\d+\\.\\d+\\.\\d+$/" + - | + cd ElectronClient/app + npm install + yarn dist From 4fd62bf7bf7a06872ee25fd4bbab8215b271ea9f Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 13 Nov 2017 14:24:08 +0000 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 357bf2b0d..904d3fa01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,9 @@ cache: - node_modules - $HOME/.cache/electron - $HOME/.cache/electron-builder + +before_install: + - brew install yarn script: - |