Skip to content

Commit 57e9f56

Browse files
VGalaxiesimbajin
andauthored
fix(dist): add license for swagger-ui & reset use stage to false in ci yml (#2706)
* setup * disable use stage * improve ci --------- Co-authored-by: imbajin <jin@apache.org>
1 parent f147460 commit 57e9f56

File tree

8 files changed

+31
-26
lines changed

8 files changed

+31
-26
lines changed

.github/workflows/check-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
dependency-check:
1414
runs-on: ubuntu-latest
1515
env:
16-
USE_STAGE: 'true' # Whether to include the stage repository.
16+
USE_STAGE: 'false' # Whether to include the stage repository.
1717
SCRIPT_DEPENDENCY: install-dist/scripts/dependency
1818
steps:
1919
- name: Checkout source

.github/workflows/cluster-test-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
cluster-test:
1313
runs-on: ubuntu-latest
1414
env:
15-
USE_STAGE: 'true' # Whether to include the stage repository.
15+
USE_STAGE: 'false' # Whether to include the stage repository.
1616

1717
steps:
1818
- name: Install JDK 11
@@ -45,8 +45,8 @@ jobs:
4545
4646
- name: Run simple cluster test
4747
run: |
48-
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P simple-cluster-test -DskipCommonsTests=true
48+
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P simple-cluster-test
4949
5050
- name: Run multi cluster test
5151
run: |
52-
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P multi-cluster-test -DskipCommonsTests=true
52+
mvn test -pl hugegraph-cluster-test/hugegraph-clustertest-test -am -P multi-cluster-test

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
jobs:
1313
analyze:
1414
env:
15-
USE_STAGE: 'true' # Whether to include the stage repository.
15+
USE_STAGE: 'false' # Whether to include the stage repository.
1616
name: Analyze
1717
runs-on: ubuntu-latest
1818
permissions:

.github/workflows/commons-ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313
build-commons:
1414
runs-on: ubuntu-latest
1515
env:
16-
# TODO: reset use stage to false later
17-
USE_STAGE: 'true' # Whether to include the stage repository.
16+
USE_STAGE: 'false' # Whether to include the stage repository.
1817

1918
strategy:
2019
fail-fast: false
@@ -46,9 +45,9 @@ jobs:
4645
cp $HOME/.m2/settings.xml /tmp/settings.xml
4746
cp -vf .github/configs/settings.xml $HOME/.m2/settings.xml && cat $HOME/.m2/settings.xml
4847
49-
- name: Compile
48+
- name: Install
5049
run: |
51-
mvn compile -Dmaven.javadoc.skip=true -ntp
50+
mvn install -Dmaven.javadoc.skip=true -ntp -Dmaven.test.skip=true
5251
5352
- name: Run common test
5453
run: |

.github/workflows/licence-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
check-license:
1212
runs-on: ubuntu-latest
1313
env:
14-
USE_STAGE: 'true' # Whether to include the stage repository.
14+
USE_STAGE: 'false' # Whether to include the stage repository.
1515
steps:
1616
- uses: actions/checkout@v4
1717

.github/workflows/pd-store-ci.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
env:
1616
# TODO: avoid duplicated env setup in pd & store
17-
# TODO: reset use stage to false later
18-
USE_STAGE: 'true' # Whether to include the stage repository.
17+
USE_STAGE: 'false' # Whether to include the stage repository.
1918
# TODO: remove outdated env
2019
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
2120
REPORT_DIR: target/site/jacoco
@@ -47,11 +46,11 @@ jobs:
4746
4847
- name: Run common test
4948
run: |
50-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test -DskipCommonsTests=true
49+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-common-test
5150
5251
- name: Run core test
5352
run: |
54-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test -DskipCommonsTests=true
53+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-core-test
5554
5655
# The above tests do not require starting a PD instance.
5756

@@ -65,11 +64,11 @@ jobs:
6564
6665
- name: Run client test
6766
run: |
68-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test -DskipCommonsTests=true
67+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-client-test
6968
7069
- name: Run rest test
7170
run: |
72-
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test -DskipCommonsTests=true
71+
mvn test -pl hugegraph-pd/hg-pd-test -am -P pd-rest-test
7372
7473
- name: Upload coverage to Codecov
7574
uses: codecov/codecov-action@v3.0.0
@@ -80,7 +79,7 @@ jobs:
8079
# TODO: avoid duplicated env setup
8180
runs-on: ubuntu-latest
8281
env:
83-
USE_STAGE: 'true' # Whether to include the stage repository.
82+
USE_STAGE: 'false' # Whether to include the stage repository.
8483
# TODO: remove outdated env
8584
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
8685
REPORT_DIR: target/site/jacoco
@@ -121,27 +120,27 @@ jobs:
121120
122121
- name: Run common test
123122
run: |
124-
mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test -DskipCommonsTests=true
123+
mvn test -pl hugegraph-store/hg-store-test -am -P store-common-test
125124
126125
- name: Run client test
127126
run: |
128-
mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test -DskipCommonsTests=true
127+
mvn test -pl hugegraph-store/hg-store-test -am -P store-client-test
129128
130129
- name: Run core test
131130
run: |
132-
mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test -DskipCommonsTests=true
131+
mvn test -pl hugegraph-store/hg-store-test -am -P store-core-test
133132
134133
- name: Run rocksdb test
135134
run: |
136-
mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test -DskipCommonsTests=true
135+
mvn test -pl hugegraph-store/hg-store-test -am -P store-rocksdb-test
137136
138137
- name: Run server test
139138
run: |
140-
mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test -DskipCommonsTests=true
139+
mvn test -pl hugegraph-store/hg-store-test -am -P store-server-test
141140
142141
- name: Run raft-core test
143142
run: |
144-
mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test -DskipCommonsTests=true
143+
mvn test -pl hugegraph-store/hg-store-test -am -P store-raftcore-test
145144
146145
- name: Upload coverage to Codecov
147146
uses: codecov/codecov-action@v3.0.0
@@ -152,7 +151,7 @@ jobs:
152151
# TODO: avoid duplicated env setup
153152
runs-on: ubuntu-latest
154153
env:
155-
USE_STAGE: 'true' # Whether to include the stage repository.
154+
USE_STAGE: 'false' # Whether to include the stage repository.
156155
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
157156
REPORT_DIR: target/site/jacoco
158157
BACKEND: hstore

.github/workflows/server-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313
# TODO: we need test & replace it to ubuntu-24.04 or ubuntu-latest
1414
runs-on: ubuntu-20.04
1515
env:
16-
# TODO: reset use stage to false later
17-
USE_STAGE: 'true' # Whether to include the stage repository.
16+
USE_STAGE: 'false' # Whether to include the stage repository.
1817
TRAVIS_DIR: hugegraph-server/hugegraph-dist/src/assembly/travis
1918
REPORT_DIR: target/site/jacoco
2019
BACKEND: ${{ matrix.BACKEND }}

install-dist/release-docs/LICENSE

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,14 @@ hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/id/Sn
227227
hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherOpProcessor.java from https://github.com/opencypher/cypher-for-gremlin
228228
hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/opencypher/CypherPlugin.java from https://github.com/opencypher/cypher-for-gremlin
229229

230+
========================================================================
231+
Third party Apache 2.0 licenses (swagger-ui)
232+
========================================================================
233+
234+
The following components are provided under the Apache License. See project link for details.
235+
The text of each license is the standard Apache 2.0 license.
236+
237+
(Apache License, Version 2.0) * swagger-ui v4.15.5 (https://github.com/swagger-api/swagger-ui)
230238

231239
========================================================================
232240
Third party Apache 2.0 licenses

0 commit comments

Comments
 (0)