From d85ee50d5feeb580683f98f78ff1d16b823c1dec Mon Sep 17 00:00:00 2001 From: imbajin <17706099+imbajin@users.noreply.github.com> Date: Wed, 20 Apr 2022 22:41:05 +0800 Subject: [PATCH] chore: replace mysql actions by official docker image (#1834) * chore: replace mysql actions by official docker image * update codecov v3 * move traivis file --- .travis.yml => .github/outdated/.travis.yml | 0 .../outdated/APACHE_PROPOSAL.md | 0 .github/{workflows => outdated}/cla.yml | 0 .github/workflows/ci.yml | 26 +++++++++---------- .../travis/install-mysql-via-docker.sh | 4 +-- 5 files changed, 14 insertions(+), 16 deletions(-) rename .travis.yml => .github/outdated/.travis.yml (100%) rename APACHE_PROPOSAL.md => .github/outdated/APACHE_PROPOSAL.md (100%) rename .github/{workflows => outdated}/cla.yml (100%) diff --git a/.travis.yml b/.github/outdated/.travis.yml similarity index 100% rename from .travis.yml rename to .github/outdated/.travis.yml diff --git a/APACHE_PROPOSAL.md b/.github/outdated/APACHE_PROPOSAL.md similarity index 100% rename from APACHE_PROPOSAL.md rename to .github/outdated/APACHE_PROPOSAL.md diff --git a/.github/workflows/cla.yml b/.github/outdated/cla.yml similarity index 100% rename from .github/workflows/cla.yml rename to .github/outdated/cla.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dad6487eb6..b0a1169752 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,19 +56,17 @@ jobs: run: | $TRAVIS_DIR/install-backend.sh $BACKEND - - name: Init MySQL Env - if: ${{ env.BACKEND == 'mysql' }} - uses: mirromutth/mysql-action@v1.1 - with: - host port: 3306 # Optional, default value is 3306. The port of host - container port: 3306 # Optional, default value is 3306. The port of container - character set server: 'utf8mb4' # Optional, default value is 'utf8mb4'. The '--character-set-server' option for mysqld - collation server: 'utf8mb4_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld - mysql version: '5.7' # Optional, default value is "latest". The version of the MySQL - mysql database: 'test' # Optional, default value is "test". The specified database which will be create - mysql root password: "******" # Required if "mysql user" is empty, default is empty. The root superuser password - #mysql user: 'root' # Required if "mysql root password" is empty, default is empty. The superuser for the specified database. Can use secrets, too - #mysql password: ${{ secrets.DatabasePassword }} # Required if "mysql user" exists. The password for the "mysql user" +# - name: Init MySQL Env +# if: ${{ env.BACKEND == 'mysql' }} +# uses: mirromutth/mysql-action@v1.1 +# with: +# host port: 3306 # Optional, default value is 3306. The port of host +# container port: 3306 # Optional, default value is 3306. The port of container +# character set server: 'utf8mb4' # Optional, default value is 'utf8mb4'. The '--character-set-server' option for mysqld +# collation server: 'utf8mb4_general_ci' # Optional, default value is 'utf8mb4_general_ci'. The '--collation-server' option for mysqld +# mysql version: '5.7' # Optional, default value is "latest". The version of the MySQL +# mysql database: 'test' # Optional, default value is "test". The specified database which will be create +# mysql root password: "******" # Required if "mysql user" is empty, default is empty. The root superuser password - name: Run unit test run: | @@ -93,6 +91,6 @@ jobs: $TRAVIS_DIR/run-tinkerpop-test.sh $BACKEND tinkerpop - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3.0.0 with: file: ${{ env.REPORT_DIR }}/*.xml diff --git a/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh b/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh index d2e3a8e12f..25cdf9f679 100755 --- a/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh +++ b/hugegraph-dist/src/assembly/travis/install-mysql-via-docker.sh @@ -15,5 +15,5 @@ sed -i "s/jdbc.reconnect_interval=.*/jdbc.reconnect_interval=5/" $CONF # Keep for upgrade in future -#docker pull mysql:5.7 -#docker run -p 3306:3306 --name mysql -e MYSQL_ROOT_PASSWORD="******" -d mysql:5.7 +docker pull mysql:5.7 +docker run -p 3306:3306 --name mysql -e MYSQL_ROOT_PASSWORD="******" -d mysql:5.7