fix(dist): add license for swagger-ui & reset use stage to false in c…

…i yml (#2706) * setup * disable use stage * improve ci --------- Co-authored-by: imbajin <[email protected]>
apache · Dec 30, 2024 · 57e9f56 · 57e9f56
1 parent f147460
commit 57e9f56
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 26 deletions.
diff --git a/.github/workflows/check-dependencies.yml b/.github/workflows/check-dependencies.yml
@@ -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

diff --git a/.github/workflows/cluster-test-ci.yml b/.github/workflows/cluster-test-ci.yml
@@ -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
@@ -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
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -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:

diff --git a/.github/workflows/commons-ci.yml b/.github/workflows/commons-ci.yml
@@ -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
@@ -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: |

diff --git a/.github/workflows/licence-checker.yml b/.github/workflows/licence-checker.yml
@@ -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
 

diff --git a/.github/workflows/pd-store-ci.yml b/.github/workflows/pd-store-ci.yml
@@ -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
@@ -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.
 
@@ -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/[email protected]
@@ -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
@@ -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/[email protected]
@@ -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

diff --git a/.github/workflows/server-ci.yml b/.github/workflows/server-ci.yml
@@ -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 }}

diff --git a/install-dist/release-docs/LICENSE b/install-dist/release-docs/LICENSE
@@ -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