Merge branch 'release/2.5.4'

.eslintrc

@@ -6,8 +6,7 @@
     "markdown"
   ],
   "extends": [
-    "prettier",
-    "plugin:prettier/recommended"
+    "prettier"
   ],
   "parserOptions": {
     "ecmaVersion": 2020

.travis.yml

@@ -1,86 +1,80 @@
-sudo: false
+os: linux
 language: node_js
-
-services:
-- docker
-
+services: docker
+node_js: 12
 addons:
   hosts:
   - mariadb.example.com
 
-before_script:
-# Disable services enabled by default
-- sudo /etc/init.d/mysql stop
+
 before_install:
-- chmod +x .travis/script.sh
+  - git clone https://github.com/mariadb-corporation/connector-test-machine.git
 
 install:
-  # generate SSL certificates
-  - mkdir tmp
-  - chmod +x .travis/gen-ssl.sh
-  - chmod +x .travis/sql/*
-  - chmod +x .travis/build/build.sh
-  - chmod +x .travis/build/docker-entrypoint.sh
-  - chmod 777 .travis/build/
-  - .travis/gen-ssl.sh mariadb.example.com tmp
-  - export PROJ_PATH=`pwd`
-  - export SSLCERT=$PROJ_PATH/tmp
-  - export TEST_SSL_CA_FILE=$SSLCERT/server.crt
-  - export TEST_SSL_CLIENT_KEY_FILE=$SSLCERT/client.key
-  - export TEST_SSL_CLIENT_CERT_FILE=$SSLCERT/client.crt
-  - export TEST_SSL_CLIENT_KEYSTORE_FILE=$SSLCERT/client-keystore.p12
+  - |-
+    case $TRAVIS_OS_NAME in
+      windows)
+        choco install -y --force nodejs-lts
+        # force refresh path
+        export PATH=$(cmd.exe //c "refreshenv > nul & C:\Progra~1\Git\bin\bash -c 'echo \$PATH' ")
+        connector-test-machine/launch.bat -t "$srv" -v "$v" -d testn
+        ;;
+      linux)
+        source connector-test-machine/launch.sh -t "$srv" -v "$v" -d testn
+        ;;
+    esac
 
 env:
   global:
-  - TEST_PORT=3305
-  - TEST_HOST=mariadb.example.com
   - RUN_LONG_TEST=1
 
-matrix:
+jobs:
+  fast_finish: true
   allow_failures:
-  - node_js: "12"
-    env: DB=build:10.6 SKIP_LEAK=1
+    - env: srv=skysql
+    - env: srv=skysql-ha
+    - env: srv=build v=10.6
+    - env: srv=mariadb-es v=10.5
   include:
-  - node_js: "12"
-    env: DB=build:10.6 SKIP_LEAK=1
-  - node_js: "12"
-    env: SKYSQL=true SKIP_LEAK=1
-  - node_js: "12"
-    env: SKYSQL_HA=true MAXSCALE_TEST_DISABLE=true SKIP_LEAK=1
-  - node_js: "10"
-    env: DB=mariadb:10.5
-  - node_js: "12"
-    env: DB=mariadb:10.5 SKIP_LEAK=1 ADDITIONAL_CONF=--version=10.5.199
-  - node_js: "14"
-    env: DB=mariadb:10.5 SKIP_LEAK=1
-  - node_js: "15"
-    env: DB=mariadb:10.5 SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mariadb:10.5 SKIP_LEAK=1 TEST_COLLATION=cp1251_general_ci
-  - node_js: "12"
-    env: DB=mariadb:10.5 LINT=1 SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mariadb:10.5 BENCH=1 SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mariadb:10.5 MAXSCALE_VERSION=2.5.7 MAXSCALE_TEST_DISABLE=true SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mariadb:10.2 SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mariadb:10.3 SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mariadb:10.4 SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mysql:5.7 SKIP_LEAK=1
-  - node_js: "12"
-    env: DB=mysql:8.0 SKIP_LEAK=1 ADDITIONAL_CONF=--default-authentication-plugin=mysql_native_password
-
-notifications:
-  email: false
+    - env: srv=mariadb v=10.5
+      os: windows
+      language: shell
+    - env: srv=mariadb v=10.2
+    - env: srv=mariadb v=10.3
+    - env: srv=mariadb v=10.4
+    - env: srv=mariadb v=10.5
+    - env: srv=mariadb v=10.5
+      node_js: 14
+    - env: srv=mariadb v=10.5
+      node_js: 16
+    - env: srv=mariadb-es v=10.5
+    - env: srv=mariadb v=10.5 BENCH=1
+    - env: srv=maxscale
+    - env: srv=skysql
+    - env: srv=skysql-ha
+    - env: srv=build v=10.6
+    - env: srv=mysql v=5.7
+    - env: srv=mysql v=8.0
 
 script:
-- npm install
-- npm install nyc -g
-- .travis/script.sh
+  - npm install
+  - npm install nyc -g
+  - |-
+    case $TRAVIS_OS_NAME in
+      windows)
+        npm run coverage:test
+        ;;
+      linux)
+        npm run test:lint
+        if [ -n "$BENCH" ] ; then
+          npm install promise-mysql mysql2
+          npm install microtime
+          npm run benchmark
+        else
+          npm run coverage:test
+        fi
+        ;;
+    esac
 
 after_success:
-- if [ -z "$BENCH" ] ; then npm run coverage:report; fi
+  - if [ -z "$BENCH" ] ; then npm run coverage:report; fi