This is an automated email from the ASF dual-hosted git repository.
guoshoujing pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-hugegraph-toolchain.git
The following commit(s) were added to refs/heads/master by this push:
new 66b1f782 chore: use .asf.yaml for apache workflow rule & add RAT in
action (#266)
66b1f782 is described below
commit 66b1f78205c4b444b3c5e2759898411264c13afc
Author: imbajin <[email protected]>
AuthorDate: Wed Feb 8 22:38:40 2023 +0800
chore: use .asf.yaml for apache workflow rule & add RAT in action (#266)
* chore: add rat check in ci
* refactor the action files
---
.github/workflows/check-dependencies.yml | 32 ----------------------
.github/workflows/client-ci.yml | 2 +-
.github/workflows/hubble-ci.yml | 10 +++----
.github/workflows/license-checker.yml | 31 +++++++++++++++++----
.github/workflows/loader-ci.yml | 10 +++----
.github/workflows/stale.yml | 2 +-
.github/workflows/tools-ci.yml | 12 ++++----
.../hugegraph/config/TomcatServletConfig.java | 9 ++----
.../apache/hugegraph/loader/util/ParquetUtil.java | 4 ---
9 files changed, 47 insertions(+), 65 deletions(-)
diff --git a/.github/workflows/check-dependencies.yml
b/.github/workflows/check-dependencies.yml
deleted file mode 100644
index 448c12cb..00000000
--- a/.github/workflows/check-dependencies.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: third-party dependencies check
-
-on:
- push:
- branches:
- - master
- - /^release-.*$/
- pull_request:
-
-jobs:
- build:
- runs-on: ubuntu-latest
- env:
- STATIC_DIR: hugegraph-loader/assembly/static
- SCRIPT_DEPENDENCY: hugegraph-dist/scripts/dependency
- steps:
- - name: Checkout source
- uses: actions/checkout@v3
- - name: Set up JDK 11
- uses: actions/setup-java@v3
- with:
- java-version: '11'
- distribution: 'adopt'
- - name: mvn install
- run: |
- mvn install -DskipTests=true -Dmaven.javadoc.skip=true -ntp
- - name: generate current dependencies
- run: |
- bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh
current-dependencies.txt
- - name: check third dependencies
- run: |
- bash $SCRIPT_DEPENDENCY/check_dependencies.sh
diff --git a/.github/workflows/client-ci.yml b/.github/workflows/client-ci.yml
index 7fc11a42..15488ae0 100644
--- a/.github/workflows/client-ci.yml
+++ b/.github/workflows/client-ci.yml
@@ -1,4 +1,4 @@
-name: hugegraph-client-ci
+name: "hugegraph-client-ci"
on:
push:
diff --git a/.github/workflows/hubble-ci.yml b/.github/workflows/hubble-ci.yml
index 26056465..2c0edc8c 100644
--- a/.github/workflows/hubble-ci.yml
+++ b/.github/workflows/hubble-ci.yml
@@ -1,4 +1,4 @@
-name: hugegraph-hubble-ci
+name: "hugegraph-hubble-ci"
on:
push:
@@ -22,19 +22,19 @@ on:
env:
TRAVIS_DIR: hugegraph-hubble/hubble-dist/assembly/travis
- # TODO: need update it later
+ # TODO: need update it later (eed6103359fe40d2f1476fb8c56d9388c3111a99)
COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314
jobs:
hubble-ci:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
env:
STATIC_DIR: hugegraph-hubble/hubble-dist/assembly/static
steps:
- - name: Install JDK 8
+ - name: Install JDK 11
uses: actions/setup-java@v3
with:
- java-version: '8'
+ java-version: '11'
distribution: 'adopt'
# we also should cache python & yarn & downloads to avoid useless work
diff --git a/.github/workflows/license-checker.yml
b/.github/workflows/license-checker.yml
index 1f2cd15e..334519ea 100644
--- a/.github/workflows/license-checker.yml
+++ b/.github/workflows/license-checker.yml
@@ -17,22 +17,21 @@
# under the License.
#
-name: License checker
+name: "license checker"
on:
push:
branches:
- master
+ - /^release-.*$/
pull_request:
- branches:
- - master
jobs:
- check-license:
+ check-license-header:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- # A full-featured license tool to check and fix license headers and
resolve dependencies' licenses: https://github.com/apache/skywalking-eyes
+ # More info could refer to: https://github.com/apache/skywalking-eyes
- name: Check License Header
uses: apache/skywalking-eyes@main
env:
@@ -51,3 +50,25 @@ jobs:
mvn apache-rat:check -ntp
find ./ -name rat.txt -print0 | xargs -0 -I file cat file >
merged-rat.txt
grep "Binaries" merged-rat.txt -C 3 && cat merged-rat.txt
+
+ check-dependency-license:
+ runs-on: ubuntu-latest
+ env:
+ SCRIPT_DEPENDENCY: hugegraph-dist/scripts/dependency
+ steps:
+ - name: Checkout source
+ uses: actions/checkout@v3
+ - name: Set up JDK 11
+ uses: actions/setup-java@v3
+ with:
+ java-version: '11'
+ distribution: 'adopt'
+ - name: mvn install
+ run: |
+ mvn install -DskipTests=true -ntp
+ - name: generate current dependencies
+ run: |
+ bash $SCRIPT_DEPENDENCY/regenerate_known_dependencies.sh
current-dependencies.txt
+ - name: check third dependencies
+ run: |
+ bash $SCRIPT_DEPENDENCY/check_dependencies.sh
diff --git a/.github/workflows/loader-ci.yml b/.github/workflows/loader-ci.yml
index c2f3b626..ad4f5289 100644
--- a/.github/workflows/loader-ci.yml
+++ b/.github/workflows/loader-ci.yml
@@ -1,4 +1,4 @@
-name: hugegraph-loader-ci
+name: "hugegraph-loader-ci"
on:
push:
@@ -20,7 +20,7 @@ on:
jobs:
loader-ci:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
env:
TRAVIS_DIR: hugegraph-loader/assembly/travis
STATIC_DIR: hugegraph-loader/assembly/static
@@ -29,11 +29,11 @@ jobs:
DB_PASS: root
DB_DATABASE: load_test
steps:
- - name: Install JDK 8
+ - name: Install JDK 11
uses: actions/setup-java@v3
with:
- java-version: '8'
- distribution: 'zulu'
+ java-version: '11'
+ distribution: 'adopt'
- name: Cache Maven packages
uses: actions/cache@v3
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 8de32a4f..3da56372 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,4 +1,4 @@
-name: Mark stale issues and pull requests
+name: "Mark stale issues and pull requests"
on:
schedule:
diff --git a/.github/workflows/tools-ci.yml b/.github/workflows/tools-ci.yml
index 5e2c535a..5028048c 100644
--- a/.github/workflows/tools-ci.yml
+++ b/.github/workflows/tools-ci.yml
@@ -1,4 +1,4 @@
-name: hugegraph-tools-ci
+name: "hugegraph-tools-ci"
on:
push:
branches:
@@ -19,17 +19,17 @@ on:
jobs:
tools-ci:
- runs-on: ubuntu-20.04
+ runs-on: ubuntu-latest
env:
TRAVIS_DIR: hugegraph-tools/assembly/travis
- # TODO: could we use one param to unify it? or use a action template
+ # TODO: could we use one param to unify it? or use a action template
(could use one ci file)
COMMIT_ID: be6ee386b9939dc6bd6fcbdf2274b8acc3a0a314
steps:
- - name: Install JDK 8
+ - name: Install JDK 11
uses: actions/setup-java@v3
with:
- java-version: '8'
- distribution: 'zulu'
+ java-version: '11'
+ distribution: 'adopt'
- name: Cache Maven packages
uses: actions/cache@v3
with:
diff --git
a/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/TomcatServletConfig.java
b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/TomcatServletConfig.java
index ffce8205..9d0de09b 100644
---
a/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/TomcatServletConfig.java
+++
b/hugegraph-hubble/hubble-be/src/main/java/org/apache/hugegraph/config/TomcatServletConfig.java
@@ -29,13 +29,10 @@ import
org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactor
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.stereotype.Component;
-/**
- * TODO: 404 not found & ensure if we need this class?
- * Reference http://www.zizhixiaoshe.com/article/invalidcookie.html
- */
+// TODO: remove this class if we don't need it anymore
@Component
-public class TomcatServletConfig
- implements WebServerFactoryCustomizer<TomcatServletWebServerFactory> {
+public class TomcatServletConfig implements
+
WebServerFactoryCustomizer<TomcatServletWebServerFactory> {
@Autowired
private HugeConfig config;
diff --git
a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/ParquetUtil.java
b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/ParquetUtil.java
index c719f425..cafcbefb 100644
---
a/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/ParquetUtil.java
+++
b/hugegraph-loader/src/main/java/org/apache/hugegraph/loader/util/ParquetUtil.java
@@ -68,10 +68,6 @@ public class ParquetUtil {
return object;
}
- /**
- * TODO: ensure the refer is valid or rewrite it by ourselves
- *
Reference:https://stackoverflow.com/questions/53690299/int96value-to-date-string
- */
private static Date dateFromInt96(Binary value) {
byte[] int96Bytes = value.getBytes();
// Find Julian day
