diff --git a/.github/workflows/hyperf-test.yml b/.github/workflows/hyperf-test.yml index 0b9efb6e..48a1b770 100644 --- a/.github/workflows/hyperf-test.yml +++ b/.github/workflows/hyperf-test.yml @@ -45,7 +45,7 @@ jobs: fail-fast: false env: SW_VERSION: ${{ matrix.sw-version }} - MYSQL_VERSION: '8.0.32' + MYSQL_VERSION: '5.7' PGSQL_VERSION: '14' steps: - name: Checkout @@ -55,16 +55,6 @@ jobs: sudo apt-get clean sudo apt-get update sudo apt-get upgrade -f - - name: Setup Mysql - uses: mirromutth/mysql-action@v1.1 - with: - host port: 3800 # Optional, default value is 3306. The port of host - container port: 3307 # Optional, default value is 3306. The port of container - character set server: 'utf8' # Optional, default value is 'utf8mb4'. The '--character-set-server' option for mysqld - collation server: 'utf8_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld - mysql version: '8.0' # Optional, default value is "latest". The version of the MySQL - mysql database: 'some_test' # Optional, default value is "test". The specified database which will be create - mysql root password: root - name: Setup PHP uses: shivammathur/setup-php@v2 with: diff --git a/.travis/setup.mysql.sh b/.travis/setup.mysql.sh index 924cf2e2..66d7aa12 100755 --- a/.travis/setup.mysql.sh +++ b/.travis/setup.mysql.sh @@ -4,7 +4,7 @@ CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) TRAVIS_BUILD_DIR="${TRAVIS_BUILD_DIR:-$(dirname $(dirname $CURRENT_DIR))}" echo -e "Create MySQL database..." -mysql -h 127.0.0.1 -u root -proot -e "CREATE DATABASE IF NOT EXISTS mineadmin charset=utf8mb4 collate=utf8mb4_unicode_ci;" +mysql -h 127.0.0.1 -u root -e "CREATE DATABASE IF NOT EXISTS mineadmin charset=utf8mb4 collate=utf8mb4_unicode_ci;" echo -e "Done\n" diff --git a/.travis/setup.services.sh b/.travis/setup.services.sh index 2cd0483d..09c10645 100755 --- a/.travis/setup.services.sh +++ b/.travis/setup.services.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# docker run --name mysql -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=true -d mysql:${MYSQL_VERSION} --bind-address=0.0.0.0 --default-authentication-plugin=mysql_native_password & + docker run --name mysql -p 3306:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=true -d mysql:${MYSQL_VERSION} --bind-address=0.0.0.0 --default-authentication-plugin=mysql_native_password & docker run --name postgres -p 5432:5432 -e POSTGRES_PASSWORD=postgres -d postgres:${PGSQL_VERSION} & docker run --name redis -p 6379:6379 -d redis & docker run -d --name dev-consul -e CONSUL_BIND_INTERFACE=eth0 -p 8500:8500 consul:1.15.4 &