Skip to content

Commit 13f09a6

Browse files
committed
fix: MariaDB CI with proper healthcheck
1 parent 13c708a commit 13f09a6

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,15 @@ jobs:
4141
ports:
4242
- 3306
4343
env:
44+
MARIADB_ROOT_PASSWORD: root
45+
MARIADB_DATABASE: with_advisory_lock_trilogy_test
4446
MARIADB_USER: with_advisory
4547
MARIADB_PASSWORD: with_advisory_pass
46-
MARIADB_DATABASE: with_advisory_lock_trilogy_test
47-
MARIADB_ROOT_PASSWORD: root_pass
48-
MARIADB_MYSQL_LOCALHOST_USER: 1
49-
MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE
5048
options: >-
51-
--health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized"
49+
--health-cmd="mysqladmin ping -h 127.0.0.1 -uroot -proot || exit 1"
5250
--health-interval=10s
5351
--health-timeout=5s
54-
--health-retries=10
52+
--health-retries=12
5553
strategy:
5654
fail-fast: false
5755
matrix:
@@ -76,13 +74,6 @@ jobs:
7674
bundler-cache: true
7775
rubygems: latest
7876

79-
- name: Wait for MariaDB
80-
run: |
81-
until nc -z 127.0.0.1 ${{ job.services.mariadb.ports[3306] }}; do
82-
echo "Waiting for MariaDB to be ready..."
83-
sleep 1
84-
done
85-
echo "MariaDB is ready"
8677

8778
- name: Setup test databases
8879
env:

0 commit comments

Comments
 (0)