Merge pull request #884 from kyonRay/master

Release 3.6.0

Author: kyonRay

.ci/ci_check.sh

@@ -138,6 +138,10 @@ check_standard_node()
   prepare_environment "${2}"
   ## run integration test
   bash gradlew clean integrationTest --info
+  # if $? is not 0, then exit
+  if [ ${?} -ne 0 ]; then
+    cat log/*.log
+  fi
   ## clean
   clean_node "${1}"
 }
@@ -170,28 +174,39 @@ LOG_INFO "------ download_binary: v3.1.0---------"
 download_build_chain "v3.1.0"
 download_binary "v3.1.0"
 LOG_INFO "------ check_standard_node---------"
-check_standard_node
+check_standard_node "true" "normal" "-A"
 rm -rf ./bin
 
-LOG_INFO "------ download_binary: v3.2.0---------"
-download_build_chain "v3.2.0"
-download_binary "v3.2.0"
+LOG_INFO "------ download_binary: v3.2.3---------"
+download_build_chain "v3.2.3"
+download_binary "v3.2.3"
 LOG_INFO "------ check_standard_node---------"
+check_standard_node "false" "normal" "-A"
+LOG_INFO "------ check_sm_node---------"
 check_standard_node "true" "sm" "-s -A"
 rm -rf ./bin
 
 LOG_INFO "------ download_build_chain: v3.3.0---------"
 download_binary "v3.3.0"
 download_build_chain "v3.3.0"
 LOG_INFO "------ check_standard_node---------"
-check_standard_node "true" "sm" "-s"
+check_standard_node "true"
 rm -rf ./bin
 
 LOG_INFO "------ download_build_chain: v3.4.0---------"
 download_binary "v3.4.0"
 download_build_chain "v3.4.0"
+LOG_INFO "------ check_standard_node---------"
+check_standard_node "true"
+rm -rf ./bin
+
+LOG_INFO "------ download_build_chain: v3.5.0---------"
+download_binary "v3.5.0"
+download_build_chain "v3.5.0"
 LOG_INFO "------ check_wasm_node---------"
 check_wasm_node "false"
 LOG_INFO "------ check_standard_node---------"
+check_standard_node "false" "normal"
+LOG_INFO "------ check_standard_node---------"
 check_standard_node "true" "sm" "-s"
 rm -rf ./bin

.github/workflows/workflow.yml

@@ -41,17 +41,17 @@ jobs:
         if: runner.os == 'macOS'
         run: |
           brew install openssl@1.1 ccache
-      - name: Set up JDK 1.8.0.345
+      - name: Set up JDK 1.8.0.382
         uses: actions/setup-java@v3
         with:
             distribution: 'zulu'
-            java-version: '8.0.345'
+            java-version: '8.0.382'
       - name: run build test
         if: runner.os == 'Windows'
         run: ./gradlew.bat build
       - name: run integration testing
         # FIXME: macOS WASM integration testing failed
-        if: runner.os != 'Windows' && runner.os != 'macOS'
+        if: runner.os != 'Windows'
         run: /bin/bash .ci/ci_check.sh
 
   build-centos:

build.gradle

@@ -20,11 +20,11 @@ ext {
     commonsIOVersion = '2.11.0'
     commonsLang3Version = '3.12.0'
     toml4jVersion = "0.7.2"
-    bcprovJDK15onVersion = '1.69'
+    bcprovJDK18onVersion = '1.75'
     webankJavaCryptoVersion = "1.0.3"
     junitVersion = '4.13.2'
     commonsCollections4Version = "4.4"
-    bcosSdkJniVersion = "3.5.0"
+    bcosSdkJniVersion = "3.6.0-SNAPSHOT"
     slf4jApiVerison = '1.7.36'
     mockitoVersion = '4.8.0'
     gsonVersion = '2.10.1'
@@ -35,12 +35,12 @@ ext {
 // integrationTest.mustRunAfter test
 allprojects {
     group = 'org.fisco-bcos.java-sdk'
-    version = '3.5.0'
+    version = '3.6.0-SNAPSHOT'
 
     apply plugin: 'maven-publish'
     apply plugin: 'idea'
     apply plugin: 'eclipse'
-    
+
     apply plugin: 'java'
     apply plugin: 'java-library'
     apply plugin: 'jacoco'
@@ -125,13 +125,13 @@ googleJavaFormat {
 }
 
 dependencies {
-	api("org.fisco-bcos:fisco-bcos-tars-sdk" + ":${tarsSDKVersion}")
-    api("org.fisco-bcos:bcos-sdk-jni:${bcosSdkJniVersion}")  {
-        exclude group : "org.slf4j"
-        exclude group : "com.fasterxml.jackson.core"
+    api("org.fisco-bcos:fisco-bcos-tars-sdk" + ":${tarsSDKVersion}")
+    api("org.fisco-bcos:bcos-sdk-jni:${bcosSdkJniVersion}") {
+        exclude group: "org.slf4j"
+        exclude group: "com.fasterxml.jackson.core"
     }
 
-    api("org.bouncycastle:bcprov-jdk15on:${bcprovJDK15onVersion}")
+    api("org.bouncycastle:bcprov-jdk18on:${bcprovJDK18onVersion}")
     api("com.google.code.gson:gson:${gsonVersion}")
     api("org.apache.commons:commons-lang3:${commonsLang3Version}")
     api("com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}")
@@ -159,13 +159,13 @@ configurations {
 }
 
 task integrationTest(type: Test) {
-    dependsOn test
+//    dependsOn test
     testClassesDirs = sourceSets.integrationTest.output.classesDirs
     classpath = sourceSets.integrationTest.runtimeClasspath
 }
 
 task integrationWasmTest(type: Test) {
-    dependsOn test
+//    dependsOn test
     testClassesDirs = sourceSets.integrationWasmTest.output.classesDirs
     classpath = sourceSets.integrationWasmTest.runtimeClasspath
 }
@@ -176,6 +176,15 @@ javadoc {
     options.addStringOption('charSet', 'UTF-8')
 }
 
+task copyHooks(type: Copy) {
+    if (!file(".git/hooks/pre-commit").exists()) {
+        from("hooks") {
+            include "**"
+        }
+        into ".git/hooks"
+    }
+}
+
 task sourcesJar(type: Jar) {
     from sourceSets.main.allJava
     archiveClassifier = 'sources'
@@ -199,9 +208,9 @@ jacocoTestReport {
     }
 }
 
-tasks.withType(Test) {
-    finalizedBy jacocoTestReport
-}
+//tasks.withType(Test) {
+//    finalizedBy jacocoTestReport
+//}
 
 publishing {
     publications {
@@ -258,7 +267,7 @@ publishing {
 
 jar {
     // destinationDir file('dist/apps')
-    archiveFileName="fisco-bcos-" + project.name + '-' + project.version + '.jar'
+    archiveFileName = "fisco-bcos-" + project.name + '-' + project.version + '.jar'
     exclude '**/*.xml'
     exclude '**/*.properties'
 
@@ -304,3 +313,4 @@ jar {
     }
 }
 check.dependsOn jacocoTestReport
+verifyGoogleJavaFormat.dependsOn(copyHooks)

hooks/pre-commit

@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+bash gradlew verifyGoogleJavaFormat
+result=$?
+printf "the verifyGoogleJavaFormat result code is $result"
+if [[ "$result" = 0 ]] ; then
+    echo "\033[32m
+    ....
+    ....
+    verifyGoogleJavaFormat Pass!!
+    ....
+    ....
+    \033[0m"
+    exit 0
+else
+    bash gradlew goJF
+    echo "\033[31m
+    ....
+    ....
+    verifyGoogleJavaFormat Failed!!
+    Code format has been automatically adjusted, please review the code and then git add. && git commit;
+    ....
+    ....
+    \033[0m"
+    exit 1
+fi