Skip to content

fix(dist): add license for swagger-ui & reset use stage to false in ci yml #2706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackyYangPassion merged 4 commits into from
Dec 30, 2024
Merged

fix(dist): add license for swagger-ui & reset use stage to false in ci yml #2706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eda75b1
setup
VGalaxies Dec 13, 2024
751f6be
disable use stage
VGalaxies Dec 16, 2024
a147bb8
improve ci
VGalaxies Dec 25, 2024
b11ccc4
Merge branch 'master' into swagger-ui-license
imbajin Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
dependency-check:
runs-on: ubuntu-latest
env:
USE_STAGE: 'true' # Whether to include the stage repository.
USE_STAGE: 'false' # Whether to include the stage repository.
SCRIPT_DEPENDENCY: install-dist/scripts/dependency
steps:
- name: Checkout source
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cluster-test-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
cluster-test:
runs-on: ubuntu-latest
env:
USE_STAGE: 'true' # Whether to include the stage repository.
USE_STAGE: 'false' # Whether to include the stage repository.

steps:
- name: Install JDK 11
Expand Down Expand Up @@ -45,8 +45,8 @@ jobs:

- name: Run simple cluster test
run: |
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P simple-cluster-test -DskipCommonsTests=true
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P simple-cluster-test

- name: Run multi cluster test
run: |
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P multi-cluster-test -DskipCommonsTests=true
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P multi-cluster-test
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
analyze:
env:
USE_STAGE: 'true' # Whether to include the stage repository.
USE_STAGE: 'false' # Whether to include the stage repository.
name: Analyze
runs-on: ubuntu-latest
permissions:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/commons-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ jobs:
build-commons:
runs-on: ubuntu-latest
env:
# TODO: reset use stage to false later
USE_STAGE: 'true' # Whether to include the stage repository.
USE_STAGE: 'false' # Whether to include the stage repository.

strategy:
fail-fast: false
Expand Down Expand Up @@ -46,9 +45,9 @@ jobs:
cp $HOME/.m2/settings.xml /tmp/settings.xml
cp -vf .github/configs/settings.xml $HOME/.m2/settings.xml && cat $HOME/.m2/settings.xml

- name: Compile
- name: Install
run: |
mvn compile -Dmaven.javadoc.skip=true -ntp
mvn install -Dmaven.javadoc.skip=true -ntp -Dmaven.test.skip=true

- name: Run common test
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/licence-checker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
check-license:
runs-on: ubuntu-latest
env:
USE_STAGE: 'true' # Whether to include the stage repository.
USE_STAGE: 'false' # Whether to include the stage repository.
steps:
- uses: actions/checkout@v4

Expand Down
27 changes: 13 additions & 14 deletions .github/workflows/pd-store-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jobs:
runs-on: ubuntu-latest
env:
# TODO: avoid duplicated env setup in pd & store
# TODO: reset use stage to false later
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
Expand Down Expand Up @@ -47,11 +46,11 @@ jobs:

- name: Run common test
run: |
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test -DskipCommonsTests=true
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test

- name: Run core test
run: |
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test -DskipCommonsTests=true
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test

# The above tests do not require starting a PD instance.

Expand All @@ -65,11 +64,11 @@ jobs:

- name: Run client test
run: |
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test -DskipCommonsTests=true
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test

- name: Run rest test
run: |
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test -DskipCommonsTests=true
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3.0.0
Expand All @@ -80,7 +79,7 @@ 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
Expand Down Expand Up @@ -121,27 +120,27 @@ jobs:

- name: Run common test
run: |
mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test -DskipCommonsTests=true
mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test

- name: Run client test
run: |
mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test -DskipCommonsTests=true
mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test

- name: Run core test
run: |
mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test -DskipCommonsTests=true
mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test

- name: Run rocksdb test
run: |
mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test -DskipCommonsTests=true
mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test

- name: Run server test
run: |
mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test -DskipCommonsTests=true
mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test

- name: Run raft-core test
run: |
mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test -DskipCommonsTests=true
mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3.0.0
Expand All @@ -152,7 +151,7 @@ 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.
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
REPORT_DIR: target/site/jacoco
BACKEND: hstore
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/server-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ jobs:
# TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest
runs-on: ubuntu-20.04
env:
# TODO: reset use stage to false later
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 }}
Expand Down
8 changes: 8 additions & 0 deletions install-dist/release-docs/LICENSE
View file
Open in desktop
Copy link
Copy Markdown
Member

@imbajin imbajin Dec 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we should disable the 'stage' param in this PR

Also, mark a TODO for using common/rpc dependency directly

Copy link
Copy Markdown
Contributor Author

@VGalaxies VGalaxies Dec 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, mark a TODO for using common/rpc dependency directly

where to mark?

Copy link
Copy Markdown
Member

@imbajin imbajin Dec 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, mark a TODO for using common/rpc dependency directly

where to mark?

Using the stage param of the server-ci.yml (one is enough) + usage in the pom.xml (common/rpc)

Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,14 @@ hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/Sn
hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java from https://github.com/opencypher/cypher-for-gremlin
hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java from https://github.com/opencypher/cypher-for-gremlin

========================================================================
Third party Apache 2.0 licenses (swagger-ui)
========================================================================

The following components are provided under the Apache License. See project link for details.
The text of each license is the standard Apache 2.0 license.

(Apache License, Version 2.0) * swagger-ui v4.15.5 (https://github.com/swagger-api/swagger-ui)

========================================================================
Third party Apache 2.0 licenses
Expand Down