Skip to content

Commit 3b3d77c

Browse files
committed
ci: try to fix mariadb
1 parent b50c287 commit 3b3d77c

File tree

1 file changed

+12
-25
lines changed

1 file changed

+12
-25
lines changed

.github/workflows/nodejs.yml

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@ name: CI
22

33
on: [push, pull_request]
44

5-
env:
6-
POSTGRES_USER: postgres
7-
POSTGRES_PASSWORD: password
8-
POSTGRES_DB: sequelize
9-
10-
MYSQL_USER: sequelize
11-
MYSQL_DATABASE: sequelize
12-
MYSQL_PASSWORD: password
13-
14-
MARIADB_USER: sequelize
15-
MARIADB_DATABASE: sequelize
16-
MARIADB_PASSWORD: password
17-
185
jobs:
196
lint:
207
runs-on: ubuntu-latest
@@ -58,9 +45,9 @@ jobs:
5845
postgres:
5946
image: postgres:${{ matrix.postgres-version }}
6047
env:
61-
POSTGRES_USER: ${{ env.POSTGRES_USER }}
62-
POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
63-
POSTGRES_DB: ${{ env.POSTGRES_DB }}
48+
POSTGRES_USER: postgres
49+
POSTGRES_PASSWORD: password
50+
POSTGRES_DB: sequelize
6451
ports:
6552
- 5432:5432
6653
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
@@ -88,10 +75,10 @@ jobs:
8875
mysql:
8976
image: mysql:${{ matrix.mysql-version }}
9077
env:
91-
MYSQL_DATABASE: ${{ env.MYSQL_DATABASE }}
92-
MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_PASSWORD }}
93-
MYSQL_USER: ${{ env.MYSQL_USER }}
94-
MYSQL_PASSWORD: ${{ env.MYSQL_PASSWORD }}
78+
MYSQL_DATABASE: sequelize
79+
MYSQL_ROOT_PASSWORD: password
80+
MYSQL_USER: sequelize
81+
MYSQL_PASSWORD: password
9582
ports:
9683
- 3306:3306
9784
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries 5
@@ -119,13 +106,13 @@ jobs:
119106
mariadb:
120107
image: mariadb:${{ matrix.mariadb-version }}
121108
env:
122-
MARIADB_DATABASE: ${{ env.MARIADB_DATABASE }}
123-
MARIADB_ROOT_PASSWORD: ${{ env.MARIADB_PASSWORD }}
124-
MARIADB_USER: ${{ env.MARIADB_USER }}
125-
MARIADB_PASSWORD: ${{ env.MARIADB_PASSWORD }}
109+
MARIADB_DATABASE: sequelize
110+
MARIADB_ROOT_PASSWORD: root_password
111+
MARIADB_USER: sequelize
112+
MARIADB_PASSWORD: password
126113
ports:
127114
- 3306:3306
128-
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries 5
115+
options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
129116

130117
steps:
131118
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)