diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 8b92aa28..0188f8af 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Run tests run: | cd integration-tests - yarn test + yarn test:ci services: postgres: @@ -36,10 +36,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 @@ -48,5 +48,5 @@ jobs: SA_PASSWORD: Pwd2020Db MSSQL_PID: Express - cockroachdb: - image: cockroachdb/cockroach + # cockroachdb: + # image: cockroachdb/cockroach diff --git a/integration-tests/engines.js b/integration-tests/engines.js index 73891dd1..38173a29 100644 --- a/integration-tests/engines.js +++ b/integration-tests/engines.js @@ -20,7 +20,7 @@ const engines = [ server: 'localhost', port: 15001, }, - skipOnGithub: true, + skipOnCI: true, objects: [views], }, { @@ -91,9 +91,9 @@ const engines = [ server: 'localhost', port: 15003, }, - skipOnGithub: true, + skipOnCI: true, objects: [views], }, ]; -module.exports = engines; +module.exports = process.env.CITEST ? engines.filter(x => !x.skipOnCi) : engines; diff --git a/integration-tests/package.json b/integration-tests/package.json index b1dee812..1d4d89b2 100644 --- a/integration-tests/package.json +++ b/integration-tests/package.json @@ -10,7 +10,7 @@ "license": "MIT", "scripts": { "wait:local": "cross-env DEVMODE=1 LOCALTEST=1 node wait.js", - "test": "cross-env DEVMODE=1 jest --runInBand", + "test:ci": "cross-env DEVMODE=1 CITEST=1 jest --runInBand", "test:local": "cross-env DEVMODE=1 LOCALTEST=1 jest", "run:local": "docker-compose down && docker-compose up -d && yarn wait:local && yarn test:local" },