self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Tools: Trying to get tests to build in dev branch

Browse Source
This commit is contained in:
Laurent Cozic 2020-11-29 01:20:49 +00:00
parent 1851b0e7d1
commit 7644d05225
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,5 +1,5 @@
# Only build tags (Doesn't work - doesn't build anything) # Only build tags (Doesn't work - doesn't build anything)
if: tag IS present OR type = pull_request if: tag IS present OR type = pull_request OR branch = dev
rvm: 2.3.3 rvm: 2.3.3
@ -65,7 +65,7 @@ script:
# Run test units. # Run test units.
# Only do it for pull requests because Travis randomly fails to run them # Only do it for pull requests because Travis randomly fails to run them
# and that would break the desktop release. # and that would break the desktop release.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" = "dev" ]; then
npm run test-ci npm run test-ci
testResult=$? testResult=$?
if [ $testResult -ne 0 ]; then if [ $testResult -ne 0 ]; then