From 4c3a60c2302ac31955bd7508d70d2918f037cf5d Mon Sep 17 00:00:00 2001 From: imbajin <17706099+imbajin@users.noreply.github.com> Date: Tue, 19 Apr 2022 19:23:16 +0800 Subject: [PATCH 1/3] chore: replace mysql actions by official docker image --- .github/workflows/ci.yml | 24 +++++++++---------- .../travis/install-mysql-via-docker.sh | 4 ++-- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dad6487eb6..7c197e41fe 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: | 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 From d5b05a7f7d5ef7a398c8d644d3e209c7028be657 Mon Sep 17 00:00:00 2001 From: imbajin <17706099+imbajin@users.noreply.github.com> Date: Tue, 19 Apr 2022 22:06:02 +0800 Subject: [PATCH 2/3] update codecov v3 --- .github/workflows/ci.yml | 2 +- .github/workflows/cla.yml | 70 +++++++++++++++++++-------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c197e41fe..b0a1169752 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -91,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/.github/workflows/cla.yml b/.github/workflows/cla.yml index a182b9515b..1292f23f9b 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -1,35 +1,35 @@ -name: "CLA Assistant" -on: - issue_comment: - types: [created] - pull_request_target: - types: [opened,closed,synchronize] - -jobs: - CLAssistant: - runs-on: ubuntu-latest - steps: - - name: "CLA Assistant" - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - uses: cla-assistant/github-action@v2.1.3-beta - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # the below token should have repo scope and must be manually added by you in the repository's secret - PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} - with: - path-to-signatures: '.github/cla-signatures/cla.json' - path-to-document: 'https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md' # e.g. a CLA or a DCO document - custom-allsigned-prcomment: '**Good**! All Contributors have signed the [CLA](https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md).' - # branch should not be protected - branch: 'cla-assist' - allowlist: bot* - lock-pullrequest-aftermerge: false - - # the following are the optional inputs - If the optional inputs are not given, then default values will be taken - #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) - #remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) - #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' - #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' - #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' - #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' - #use-dco-flag: true - If you are using DCO instead of CLA +#name: "CLA Assistant" +#on: +# issue_comment: +# types: [created] +# pull_request_target: +# types: [opened,closed,synchronize] +# +#jobs: +# CLAssistant: +# runs-on: ubuntu-latest +# steps: +# - name: "CLA Assistant" +# if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' +# uses: cla-assistant/github-action@v2.1.3-beta +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# # the below token should have repo scope and must be manually added by you in the repository's secret +# PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} +# with: +# path-to-signatures: '.github/cla-signatures/cla.json' +# path-to-document: 'https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md' # e.g. a CLA or a DCO document +# custom-allsigned-prcomment: '**Good**! All Contributors have signed the [CLA](https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md).' +# # branch should not be protected +# branch: 'cla-assist' +# allowlist: bot* +# lock-pullrequest-aftermerge: false +# +# # the following are the optional inputs - If the optional inputs are not given, then default values will be taken +# #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) +# #remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) +# #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' +# #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' +# #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' +# #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' +# #use-dco-flag: true - If you are using DCO instead of CLA From c749ad00d78ba105cb25125fa096855d1081495c Mon Sep 17 00:00:00 2001 From: imbajin <17706099+imbajin@users.noreply.github.com> Date: Tue, 19 Apr 2022 22:09:42 +0800 Subject: [PATCH 3/3] move traivis file --- .travis.yml => .github/outdated/.travis.yml | 0 .../outdated/APACHE_PROPOSAL.md | 0 .github/outdated/cla.yml | 35 +++++++++++++++++++ .github/workflows/cla.yml | 35 ------------------- 4 files changed, 35 insertions(+), 35 deletions(-) rename .travis.yml => .github/outdated/.travis.yml (100%) rename APACHE_PROPOSAL.md => .github/outdated/APACHE_PROPOSAL.md (100%) create mode 100644 .github/outdated/cla.yml delete mode 100644 .github/workflows/cla.yml 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/outdated/cla.yml b/.github/outdated/cla.yml new file mode 100644 index 0000000000..a182b9515b --- /dev/null +++ b/.github/outdated/cla.yml @@ -0,0 +1,35 @@ +name: "CLA Assistant" +on: + issue_comment: + types: [created] + pull_request_target: + types: [opened,closed,synchronize] + +jobs: + CLAssistant: + runs-on: ubuntu-latest + steps: + - name: "CLA Assistant" + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + uses: cla-assistant/github-action@v2.1.3-beta + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # the below token should have repo scope and must be manually added by you in the repository's secret + PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} + with: + path-to-signatures: '.github/cla-signatures/cla.json' + path-to-document: 'https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md' # e.g. a CLA or a DCO document + custom-allsigned-prcomment: '**Good**! All Contributors have signed the [CLA](https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md).' + # branch should not be protected + branch: 'cla-assist' + allowlist: bot* + lock-pullrequest-aftermerge: false + + # the following are the optional inputs - If the optional inputs are not given, then default values will be taken + #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) + #remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) + #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' + #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' + #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' + #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' + #use-dco-flag: true - If you are using DCO instead of CLA diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml deleted file mode 100644 index 1292f23f9b..0000000000 --- a/.github/workflows/cla.yml +++ /dev/null @@ -1,35 +0,0 @@ -#name: "CLA Assistant" -#on: -# issue_comment: -# types: [created] -# pull_request_target: -# types: [opened,closed,synchronize] -# -#jobs: -# CLAssistant: -# runs-on: ubuntu-latest -# steps: -# - name: "CLA Assistant" -# if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' -# uses: cla-assistant/github-action@v2.1.3-beta -# env: -# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# # the below token should have repo scope and must be manually added by you in the repository's secret -# PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN }} -# with: -# path-to-signatures: '.github/cla-signatures/cla.json' -# path-to-document: 'https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md' # e.g. a CLA or a DCO document -# custom-allsigned-prcomment: '**Good**! All Contributors have signed the [CLA](https://github.com/hugegraph/hugegraph-doc/blob/master/CLA.md).' -# # branch should not be protected -# branch: 'cla-assist' -# allowlist: bot* -# lock-pullrequest-aftermerge: false -# -# # the following are the optional inputs - If the optional inputs are not given, then default values will be taken -# #remote-organization-name: enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) -# #remote-repository-name: enter the remote repository name where the signatures should be stored (Default is storing the signatures in the same repository) -# #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' -# #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' -# #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' -# #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' -# #use-dco-flag: true - If you are using DCO instead of CLA