Enhance Travis CI/AppVeyor configuration (#641)

4 files changed, 30 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index e0fd7b8ae..7579878b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 matrix:
+  fast_finish: true
   include:
     - os: linux
       dist: xenial
@@ -11,27 +12,28 @@ matrix:
             - libxkbfile-dev
             - rpm
     - os: osx
+      if: branch = release
       osx_image: xcode11
 
 language: node_js
-# Handle git submodules yourself
 git:
   submodules: false
-# Use sed to replace the SSH URL with the public URL, then initialize submodules
+branches:
+  only:
+    - develop
+    - release
+cache: npm
+
 before_install:
   - git submodule update --init --recursive
 install:
-  - echo do nothing
-before_script:
   - travis_retry npx lerna bootstrap
   - travis_retry npm install node-sass -g
+before_script:
+  - npm run lint && npm run test
 script:
-  - travis_retry travis_wait 100 npm run build
-
-cache: npm
+  - |
+    if [ $TRAVIS_BRANCH == "release" ]; then
+      travis_retry travis_wait 100 npm run build
+    fi
 
-branches:
-  except:
-    - i18n
-    - l10n_master
-    - l10n_develop
diff --git a/appveyor.yml b/appveyor.yml
index 1985835ef..acdd94e13 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,29 +1,22 @@
-environment:
-  APPVEYOR_CACHE_SKIP_RESTORE: true
+version: build-{build}
+branches:
+  only:
+    - release
+skip_tags: true
+skip_branch_with_pr: true
 
-version: 5.4.1-beta.4.{build}
+cache:
+  - '%APPDATA%\npm-cache'
+  - node_modules
 
 install:
   - appveyor-retry git submodule update --init --recursive
   - ps: Install-Product node 10
   - appveyor-retry npx lerna bootstrap
 
-cache:
-  - '%APPDATA%\npm-cache'
-
 before_build:
-  - npm run lint
+  - npm run lint && npm test
   - cmd: set NODE_ENV=production
 
 build_script:
   - appveyor-retry npm run build
-
-branches:
-  except:
-    - i18n
-    - l10n_master
-    - l10n_develop
-
-skip_commits:
-  files:
-    - src/i18n/locales/*.json
diff --git a/jest.config.js b/jest.config.js
index 8c9b59cf5..cca24440f 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,3 +1,8 @@
 module.exports = {
   roots: ['src'],
+  testPathIgnorePatterns: [
+    'node_modules/',
+    'recipes/',
+    'src/internal-server',
+  ]
 };
diff --git a/package.json b/package.json
index 8134be385..b97312e3d 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "lint": "eslint --quiet --fix src",
     "manage-translations": "node ./src/i18n/manage-translations.js",
     "prebuild": "gulp build",
-    "build": "npx electron-builder --publish onTag",
+    "build": "npx electron-builder",
     "rebuild": "npx electron-rebuild",
     "commit": "git-cz",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",