From a4fa75d466b3dd8ee5f416fdf3f2f9bb9dc328c6 Mon Sep 17 00:00:00 2001 From: Michael Chow Date: Sat, 23 Apr 2022 10:47:05 -0400 Subject: [PATCH] ci: use mysql image that supports arm --- .github/workflows/ci.yml | 2 +- docker-compose.yml | 5 +++-- siuba/tests/helpers.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb256df6..148dc82a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: run: | make test-travis env: - SB_TEST_PGPORT: 5432 + SB_TEST_PGPORT: 5433 PYTEST_FLAGS: ${{ matrix.pytest_flags }} # optional step for running bigquery tests ---- diff --git a/docker-compose.yml b/docker-compose.yml index f50013b9..eb6d2f7e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,9 +3,10 @@ version: '3.1' services: db_mysql: - image: mysql + image: mysql/mysql-server restart: always environment: + MYSQL_ROOT_HOST: "%" MYSQL_ROOT_PASSWORD: "" MYSQL_ALLOW_EMPTY_PASSWORD: 1 MYSQL_DATABASE: "public" @@ -21,4 +22,4 @@ services: POSTGRES_PASSWORD: "" POSTGRES_HOST_AUTH_METHOD: "trust" ports: - - 5432:5432 + - 5433:5432 diff --git a/siuba/tests/helpers.py b/siuba/tests/helpers.py index 75a77e5f..09c90b0e 100644 --- a/siuba/tests/helpers.py +++ b/siuba/tests/helpers.py @@ -26,7 +26,7 @@ def data_frame(*args, _index = None, **kwargs): "dialect": "postgresql", "driver": "", "dbname": ["SB_TEST_PGDATABASE", "postgres"], - "port": ["SB_TEST_PGPORT", "5432"], + "port": ["SB_TEST_PGPORT", "5433"], "user": ["SB_TEST_PGUSER", "postgres"], "password": ["SB_TEST_PGPASSWORD", ""], "host": ["SB_TEST_PGHOST", "localhost"],