This is an automated email from the ASF dual-hosted git repository. vgalaxies pushed a commit to branch pd-store in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 3ea3fa6623ccd466c04143c48ba8e85dc15b89d4 Author: imbajin <[email protected]> AuthorDate: Fri Apr 5 15:58:08 2024 +0800 fix: maven rat plugin exist partial failure fix: maven rat plugin exist partial failure --- .github/workflows/{pd-store.yml => pd-store-ci.yml} | 18 +++++++++++------- .github/workflows/{ci.yml => server-ci.yml} | 6 +++--- pom.xml | 8 +++++--- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pd-store.yml b/.github/workflows/pd-store-ci.yml similarity index 93% rename from .github/workflows/pd-store.yml rename to .github/workflows/pd-store-ci.yml index 884868316..922edbe50 100644 --- a/.github/workflows/pd-store.yml +++ b/.github/workflows/pd-store-ci.yml @@ -1,4 +1,4 @@ -name: "pd-store" +name: "hugegraph-pd-store-ci" on: push: @@ -8,11 +8,14 @@ on: - 'test-*' pull_request: +# TODO: consider merge to one ci.yml file jobs: pd: runs-on: ubuntu-latest env: - USE_STAGE: 'true' # Whether to include the stage repository. + # TODO: avoid duplicated env setup in pd & store + USE_STAGE: 'false' # Whether to include the stage repository. + # TODO: remove outdated env TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis REPORT_DIR: target/site/jacoco @@ -31,9 +34,9 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - fetch-depth: 2 + fetch-depth: 5 - name: use staged maven repo settings if: ${{ env.USE_STAGE == 'true' }} @@ -75,7 +78,8 @@ jobs: # TODO: avoid duplicated env setup runs-on: ubuntu-latest env: - USE_STAGE: 'true' # Whether to include the stage repository. + USE_STAGE: 'false' # Whether to include the stage repository. + # TODO: remove outdated env TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis REPORT_DIR: target/site/jacoco @@ -94,9 +98,9 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: - fetch-depth: 2 + fetch-depth: 5 - name: use staged maven repo settings if: ${{ env.USE_STAGE == 'true' }} diff --git a/.github/workflows/ci.yml b/.github/workflows/server-ci.yml similarity index 96% rename from .github/workflows/ci.yml rename to .github/workflows/server-ci.yml index b96383f7c..7af6c3be0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/server-ci.yml @@ -1,4 +1,4 @@ -name: "hugegraph-ci" +name: "hugegraph-server-ci" on: push: @@ -13,7 +13,7 @@ jobs: # TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest runs-on: ubuntu-20.04 env: - USE_STAGE: 'true' # Whether to include the stage repository. + USE_STAGE: 'false' # Whether to include the stage repository. TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis REPORT_DIR: target/site/jacoco BACKEND: ${{ matrix.BACKEND }} @@ -34,7 +34,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: - fetch-depth: 2 + fetch-depth: 5 # TODO: Remove this step after install-backend.sh updated - name: Install Java8 for backend diff --git a/pom.xml b/pom.xml index 15338e3e7..1399a62d4 100644 --- a/pom.xml +++ b/pom.xml @@ -146,21 +146,23 @@ <exclude>**/*.conf</exclude> <exclude>**/*.map</exclude> <exclude>**/*.properties</exclude> - <exclude>dist/**/*</exclude> <exclude>**/bin/hugegraph.service</exclude> <exclude>**/swagger-ui/**/*</exclude> <exclude>scripts/dev/reviewers</exclude> - <exclude>scripts/dev/reviewers</exclude> <exclude>**/*.md</exclude> <exclude>**/dependency-reduced-pom.xml</exclude> <exclude>**/logs/*.log</exclude> <exclude>**/META-INF/**/*</exclude> - <exclude>**/target/*</exclude> <exclude>style/*</exclude> <exclude>ChangeLog</exclude> <exclude>CONFIG.ini</exclude> <exclude>GROUPS</exclude> <exclude>OWNERS</exclude> + <!-- gRPC / Generated code/files --> + <exclude>**/pd/grpc/**/*.java</exclude> + <exclude>**/store/grpc/**/*.java</exclude> + <exclude>**/target/**</exclude> + <exclude>dist/**/*</exclude> <!-- Git & GitHub --> <exclude>.github/**/*</exclude> <exclude>.gitignore</exclude>
