Skip to content

Commit 2349ac8

Browse files
committed
ci: Update MSSQL DB config
1 parent 9946b08 commit 2349ac8

5 files changed

Lines changed: 12 additions & 23 deletions

File tree

.github/workflows/specs_mssql_rails61.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717

1818
env:
1919
DB_TEST: mssql
20-
MSSQL_DB_HOST: 127.0.0.1
21-
MSSQL_DB_USERNAME: sa
22-
MSSQL_DB_PASSWORD: Pa%%w0rd
2320
RAILS_VERSION: 6.1
2421

2522
services:

.github/workflows/specs_mssql_rails72.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717

1818
env:
1919
DB_TEST: mssql
20-
MSSQL_DB_HOST: 127.0.0.1
21-
MSSQL_DB_USERNAME: sa
22-
MSSQL_DB_PASSWORD: Pa%%w0rd
2320
RAILS_VERSION: 7.2
2421

2522
services:

.github/workflows/specs_mssql_rails80.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ jobs:
1717

1818
env:
1919
DB_TEST: mssql
20-
MSSQL_DB_HOST: 127.0.0.1
21-
MSSQL_DB_USERNAME: sa
22-
MSSQL_DB_PASSWORD: Pa%%w0rd
2320
RAILS_VERSION: 8.0
2421

2522
services:

extra/docker-compose.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ services:
3535
environment:
3636
POSTGRES_PASSWORD: password
3737

38+
app_with_mssql:
39+
<<: *app
40+
environment:
41+
DB_TEST: mssql
42+
DB_PORT: 1433
43+
MSSQL_DB_HOST: mssql
44+
MSSQL_DB_NAME: test_db
45+
depends_on:
46+
- mssql
47+
3848
app_with_mysql:
3949
<<: *app
4050
environment:
@@ -47,18 +57,6 @@ services:
4757
depends_on:
4858
- mysql
4959

50-
app_with_mssql:
51-
<<: *app
52-
environment:
53-
DB_TEST: mssql
54-
DB_PORT: 1433
55-
MSSQL_DB_HOST: mssql
56-
MSSQL_DB_NAME: test_db
57-
MSSQL_DB_USERNAME: sa
58-
MSSQL_DB_PASSWORD: Pa%%w0rd
59-
depends_on:
60-
- mssql
61-
6260
app_with_postgres:
6361
<<: *app
6462
environment:

spec/dummy/config/database.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ test: &test
99
host: <%= ENV.fetch('MSSQL_DB_HOST') { '127.0.0.1' } %>
1010
# port: <%= ENV.fetch('MSSQL_DB_PORT') { 1433 } %>
1111
database: <%= ENV.fetch('MSSQL_DB_NAME') { "active_storage_db_#{Rails.version.tr('.', '')}-test" } %>
12-
username: <%= ENV.fetch('MSSQL_DB_USERNAME') { '' } %>
13-
password: <%= ENV.fetch('MSSQL_DB_PASSWORD') { '' } %>
12+
username: <%= ENV.fetch('MSSQL_DB_USERNAME') { 'sa' } %>
13+
password: <%= ENV.fetch('MSSQL_DB_PASSWORD') { 'Pa%%w0rd' } %>
1414
pool: <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
1515
development:
1616
<<: *test

0 commit comments

Comments
 (0)