From 1228dec04d38735b6f8b69244740fbd62310c2de Mon Sep 17 00:00:00 2001 From: imbajin Date: Fri, 5 Apr 2024 15:58:08 +0800 Subject: [PATCH] fix: maven rat plugin exist partial failure fix: maven rat plugin exist partial failure --- .../{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(-) rename .github/workflows/{pd-store.yml => pd-store-ci.yml} (83%) rename .github/workflows/{ci.yml => server-ci.yml} (96%) diff --git a/.github/workflows/pd-store.yml b/.github/workflows/pd-store-ci.yml similarity index 83% rename from .github/workflows/pd-store.yml rename to .github/workflows/pd-store-ci.yml index 7c45e0faad..25a54c1224 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' }} @@ -54,7 +57,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 @@ -73,9 +77,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 b96383f7cd..7af6c3be0e 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 273270f9d4..1224e32a9b 100644 --- a/pom.xml +++ b/pom.xml @@ -144,21 +144,23 @@ **/*.conf **/*.map **/*.properties - dist/**/* **/bin/hugegraph.service **/swagger-ui/**/* scripts/dev/reviewers - scripts/dev/reviewers **/*.md **/dependency-reduced-pom.xml **/logs/*.log **/META-INF/**/* - **/target/* style/* ChangeLog CONFIG.ini GROUPS OWNERS + + **/pd/grpc/**/*.java + **/store/grpc/**/*.java + **/target/** + dist/**/* .github/**/* .gitignore