From e2c313af6609ebfb5578196b4fbb311fa29c49de Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 27 May 2021 15:51:54 +0200 Subject: [PATCH] try to uncomment mysql tests --- .github/workflows/integration-tests.yaml | 9 +++++---- integration-tests/engines.js | 2 +- integration-tests/package.json | 5 ++++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 0188f8af..f1ac912c 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -23,6 +23,7 @@ jobs: - name: Run tests run: | cd integration-tests + yarn wait:ci yarn test:ci services: @@ -36,10 +37,10 @@ jobs: --health-timeout 5s --health-retries 5 - # mysql: - # image: mysql - # env: - # MYSQL_ROOT_PASSWORD: Pwd2020Db + mysql: + image: mysql + env: + MYSQL_ROOT_PASSWORD: Pwd2020Db mssql: image: mcr.microsoft.com/mssql/server diff --git a/integration-tests/engines.js b/integration-tests/engines.js index 98cc082d..78f8fd72 100644 --- a/integration-tests/engines.js +++ b/integration-tests/engines.js @@ -20,7 +20,7 @@ const engines = [ server: 'localhost', port: 15001, }, - skipOnCI: true, + // skipOnCI: true, objects: [views], }, { diff --git a/integration-tests/package.json b/integration-tests/package.json index 1d4d89b2..bbf0206c 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -10,8 +10,11 @@ "license": "MIT", "scripts": { "wait:local": "cross-env DEVMODE=1 LOCALTEST=1 node wait.js", - "test:ci": "cross-env DEVMODE=1 CITEST=1 jest --runInBand", + "wait:ci": "cross-env DEVMODE=1 CITEST=1 node wait.js", + "test:local": "cross-env DEVMODE=1 LOCALTEST=1 jest", + "test:ci": "cross-env DEVMODE=1 CITEST=1 jest --runInBand", + "run:local": "docker-compose down && docker-compose up -d && yarn wait:local && yarn test:local" }, "devDependencies": {