Skip to content

Commit

Permalink
Merge #4458
Browse files Browse the repository at this point in the history
4458: test different versions of node r=jniles a=individual-it

fixes #2090

because MySQL <5.7 seems not to be supported (#4457) this adds only matrix entries for different node versions

Co-authored-by: Artur Neumann <artur@jankaritech.com>
  • Loading branch information
bors[bot] and individual-it authored May 11, 2020
2 parents cb0bea7 + 1ed69e0 commit 1f8efcd
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 13 deletions.
18 changes: 11 additions & 7 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,19 @@ image:
- Ubuntu1604
- Ubuntu1804

stack: node 12, mysql, redis
stack: mysql, redis

environment:
DB_PASS: Password12!
DB_HOST: localhost
DB_USER: root
DB_NAME: bhima_test
matrix:
- nodejs_version: "14"
- nodejs_version: "12"

install:
- sh: nvm install $nodejs_version
- bash ./sh/setup-ci-env.sh
- bash ./sh/appveyor.sh
- yarn
Expand All @@ -15,12 +25,6 @@ services:
- mysql
- redis

environment:
DB_PASS: Password12!
DB_HOST: localhost
DB_USER: root
DB_NAME: bhima_test

test_script:
- yarn build
- yarn build:db
Expand Down
25 changes: 19 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,36 @@ env:

matrix:
include:
- env: TEST_TYPE=e2e
- node_js: lts/erbium
env: TEST_TYPE=e2e
services:
- mysql
- redis
- env: TEST_TYPE=e2e
- node_js: node
env: TEST_TYPE=e2e
services:
- mysql
- redis
- node_js: lts/erbium
env: TEST_TYPE=e2e
services:
- redis
addons:
mariadb: '10.5'
- env:
- node_js: lts/erbium
env:
TEST_TYPE=installation
services:
- mysql
- redis
- node_js: node
env:
TEST_TYPE=installation
services:
- mysql
- redis
- env:
- node_js: lts/erbium
env:
TEST_TYPE=installation
addons:
mariadb: '10.5'
Expand All @@ -40,8 +55,6 @@ before_install:
- sudo ./sh/travis.sh

language: node_js
node_js:
- lts/erbium

before_script:
- sh -c "if [ '$TEST_TYPE' = 'e2e' ]; then yarn build; fi"
Expand Down

0 comments on commit 1f8efcd

Please sign in to comment.