diff options
author | Amine <amine@mouafik.fr> | 2020-04-25 18:08:00 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-25 18:08:00 +0000 |
commit | 0b03c3818101d768d9dc0760d5d2b61fa02256d2 (patch) | |
tree | 4b45991ccedbe223f4d5f648eb48804c3acbc7d3 | |
parent | Enable Dark Reader settings to follow the accent color (#646) (diff) | |
download | ferdium-app-0b03c3818101d768d9dc0760d5d2b61fa02256d2.tar.gz ferdium-app-0b03c3818101d768d9dc0760d5d2b61fa02256d2.tar.zst ferdium-app-0b03c3818101d768d9dc0760d5d2b61fa02256d2.zip |
Enhance Travis CI/AppVeyor configuration (#641)
-rw-r--r-- | .travis.yml | 26 | ||||
-rw-r--r-- | appveyor.yml | 27 | ||||
-rw-r--r-- | jest.config.js | 5 | ||||
-rw-r--r-- | package.json | 2 |
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 @@ | |||
1 | matrix: | 1 | matrix: |
2 | fast_finish: true | ||
2 | include: | 3 | include: |
3 | - os: linux | 4 | - os: linux |
4 | dist: xenial | 5 | dist: xenial |
@@ -11,27 +12,28 @@ matrix: | |||
11 | - libxkbfile-dev | 12 | - libxkbfile-dev |
12 | - rpm | 13 | - rpm |
13 | - os: osx | 14 | - os: osx |
15 | if: branch = release | ||
14 | osx_image: xcode11 | 16 | osx_image: xcode11 |
15 | 17 | ||
16 | language: node_js | 18 | language: node_js |
17 | # Handle git submodules yourself | ||
18 | git: | 19 | git: |
19 | submodules: false | 20 | submodules: false |
20 | # Use sed to replace the SSH URL with the public URL, then initialize submodules | 21 | branches: |
22 | only: | ||
23 | - develop | ||
24 | - release | ||
25 | cache: npm | ||
26 | |||
21 | before_install: | 27 | before_install: |
22 | - git submodule update --init --recursive | 28 | - git submodule update --init --recursive |
23 | install: | 29 | install: |
24 | - echo do nothing | ||
25 | before_script: | ||
26 | - travis_retry npx lerna bootstrap | 30 | - travis_retry npx lerna bootstrap |
27 | - travis_retry npm install node-sass -g | 31 | - travis_retry npm install node-sass -g |
32 | before_script: | ||
33 | - npm run lint && npm run test | ||
28 | script: | 34 | script: |
29 | - travis_retry travis_wait 100 npm run build | 35 | - | |
30 | 36 | if [ $TRAVIS_BRANCH == "release" ]; then | |
31 | cache: npm | 37 | travis_retry travis_wait 100 npm run build |
38 | fi | ||
32 | 39 | ||
33 | branches: | ||
34 | except: | ||
35 | - i18n | ||
36 | - l10n_master | ||
37 | - l10n_develop | ||
diff --git a/appveyor.yml b/appveyor.yml index 1985835ef..acdd94e13 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
@@ -1,29 +1,22 @@ | |||
1 | environment: | 1 | version: build-{build} |
2 | APPVEYOR_CACHE_SKIP_RESTORE: true | 2 | branches: |
3 | only: | ||
4 | - release | ||
5 | skip_tags: true | ||
6 | skip_branch_with_pr: true | ||
3 | 7 | ||
4 | version: 5.4.1-beta.4.{build} | 8 | cache: |
9 | - '%APPDATA%\npm-cache' | ||
10 | - node_modules | ||
5 | 11 | ||
6 | install: | 12 | install: |
7 | - appveyor-retry git submodule update --init --recursive | 13 | - appveyor-retry git submodule update --init --recursive |
8 | - ps: Install-Product node 10 | 14 | - ps: Install-Product node 10 |
9 | - appveyor-retry npx lerna bootstrap | 15 | - appveyor-retry npx lerna bootstrap |
10 | 16 | ||
11 | cache: | ||
12 | - '%APPDATA%\npm-cache' | ||
13 | |||
14 | before_build: | 17 | before_build: |
15 | - npm run lint | 18 | - npm run lint && npm test |
16 | - cmd: set NODE_ENV=production | 19 | - cmd: set NODE_ENV=production |
17 | 20 | ||
18 | build_script: | 21 | build_script: |
19 | - appveyor-retry npm run build | 22 | - appveyor-retry npm run build |
20 | |||
21 | branches: | ||
22 | except: | ||
23 | - i18n | ||
24 | - l10n_master | ||
25 | - l10n_develop | ||
26 | |||
27 | skip_commits: | ||
28 | files: | ||
29 | - 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 @@ | |||
1 | module.exports = { | 1 | module.exports = { |
2 | roots: ['src'], | 2 | roots: ['src'], |
3 | testPathIgnorePatterns: [ | ||
4 | 'node_modules/', | ||
5 | 'recipes/', | ||
6 | 'src/internal-server', | ||
7 | ] | ||
3 | }; | 8 | }; |
diff --git a/package.json b/package.json index 8134be385..b97312e3d 100644 --- a/package.json +++ b/package.json | |||
@@ -20,7 +20,7 @@ | |||
20 | "lint": "eslint --quiet --fix src", | 20 | "lint": "eslint --quiet --fix src", |
21 | "manage-translations": "node ./src/i18n/manage-translations.js", | 21 | "manage-translations": "node ./src/i18n/manage-translations.js", |
22 | "prebuild": "gulp build", | 22 | "prebuild": "gulp build", |
23 | "build": "npx electron-builder --publish onTag", | 23 | "build": "npx electron-builder", |
24 | "rebuild": "npx electron-rebuild", | 24 | "rebuild": "npx electron-rebuild", |
25 | "commit": "git-cz", | 25 | "commit": "git-cz", |
26 | "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", | 26 | "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", |