diff --git a/.travis.yml b/.travis.yml index dcf055a..a27d303 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ services: - docker env: - - MSSQL_Skip=0 MSSQL_Host=localhost MSSQL_Port=1433 MSSQL_Username=sa MSSQL_Password=!Passw0rd MSSQL_Database=typeorm_mg POSTGRES_Skip=0 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=postgres POSTGRES_Password=!Passw0rd POSTGRES_Database=typeorm_mg MYSQL_Skip=0 MYSQL_Host=localhost MYSQL_Port=3306 MYSQL_Username=root MYSQL_Password=!Passw0rd MYSQL_Database=typeorm_mg MARIADB_Skip=0 MARIADB_Host=localhost MARIADB_Port=3307 MARIADB_Username=root MARIADB_Password=!Passw0rd MARIADB_Database=typeorm_mg + - MSSQL_Skip=1 MSSQL_Host=localhost MSSQL_Port=1433 MSSQL_Username=sa MSSQL_Password=!Passw0rd MSSQL_Database=typeorm_mg POSTGRES_Skip=0 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=postgres POSTGRES_Password=!Passw0rd POSTGRES_Database=typeorm_mg MYSQL_Skip=0 MYSQL_Host=localhost MYSQL_Port=3306 MYSQL_Username=root MYSQL_Password=!Passw0rd MYSQL_Database=typeorm_mg MARIADB_Skip=0 MARIADB_Host=localhost MARIADB_Port=3307 MARIADB_Username=root MARIADB_Password=!Passw0rd MARIADB_Database=typeorm_mg before_install: - sudo service mysql stop @@ -25,4 +25,4 @@ before_script: - npm run typings-install - npm link typescript - tsc - - sleep 20s +# - sleep 20s diff --git a/docker-compose.yml b/docker-compose.yml index 5e8425c..be52c50 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,11 +29,11 @@ services: POSTGRES_PASSWORD: "!Passw0rd" # mssql - mssql: - image: "microsoft/mssql-server-linux:ctp2-1" - container_name: "typeorm-mssql" - ports: - - "1433:1433" - environment: - ACCEPT_EULA: "Y" - SA_PASSWORD: "!Passw0rd" \ No newline at end of file + # mssql: + # image: "microsoft/mssql-server-linux:ctp2-1" + # container_name: "typeorm-mssql" + # ports: + # - "1433:1433" + # environment: + # ACCEPT_EULA: "Y" + # SA_PASSWORD: "!Passw0rd" \ No newline at end of file