diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 0188f8af6..f1ac912c8 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 98cc082d1..78f8fd723 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 1d4d89b2c..bbf0206c2 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": {