<fix>(script,ci): relax check restriction of openssl version 3.x, ver…

…sion to 1.4.0, update ci to check in jdk 8.0.382.
WeBankBlockchain · Jan 28, 2024 · 91ba2f2 · 91ba2f2
1 parent 8d3b6b3
commit 91ba2f2
Show file tree

Hide file tree

Showing 22 changed files with 82 additions and 43 deletions.
diff --git a/.github/workflows/ci_check_bcos3.yml b/.github/workflows/ci_check_bcos3.yml
@@ -14,15 +14,19 @@ jobs:
         with:
           mysql root password: '123456'
       - name: install dependencies
-        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev default-jdk build-essential
+        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev build-essential
       - name: Verify MySQL connection from host
         run: |
           sudo apt-get install -y mysql-client
           mysql -u root --password=123456 -h 127.0.0.1 -P 3306 -e 'status;'
           mysql --host 127.0.0.1 --port 3306 -uroot -p123456 -e "SHOW DATABASES"
-
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_cross_bcos3_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash -x .ci/ci_cross_bcos3_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash -x .ci/ci_cross_bcos3_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_bcos_fabric.yml b/.github/workflows/ci_check_bcos_fabric.yml
@@ -14,9 +14,14 @@ jobs:
         with:
           mysql root password: '123456'
       - name: install dependencies
-        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev default-jdk build-essential
+        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev build-essential
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash .ci/ci_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash .ci/ci_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_bcos_fabric2.yml b/.github/workflows/ci_check_bcos_fabric2.yml
@@ -18,9 +18,14 @@ jobs:
         with:
           mysql root password: '123456'
       - name: install dependencies
-        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev default-jdk build-essential
+        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev build-essential
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_cross_fabric2_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash .ci/ci_cross_fabric2_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash .ci/ci_cross_fabric2_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_cross_all.yml b/.github/workflows/ci_check_cross_all.yml
@@ -14,9 +14,14 @@ jobs:
         with:
           mysql root password: '123456'
       - name: install dependencies
-        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev default-jdk build-essential
+        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev build-essential
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_cross_all_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash -x .ci/ci_cross_all_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash -x .ci/ci_cross_all_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_group_group.yml b/.github/workflows/ci_check_group_group.yml
@@ -14,9 +14,14 @@ jobs:
         with:
           mysql root password: '123456'
       - name: install dependencies
-        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev default-jdk build-essential
+        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev build-essential
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_cross_groups_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash -x .ci/ci_cross_groups_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash -x .ci/ci_cross_groups_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_group_group_mac.yml b/.github/workflows/ci_check_group_group_mac.yml
@@ -14,8 +14,13 @@ jobs:
         run: bash -x .ci/ci_mac_prepare.sh
         env:
           CI_DB_PASSWORD: '123456'
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_cross_groups_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash -x .ci/ci_cross_groups_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash -x .ci/ci_cross_groups_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_normal_gm.yml b/.github/workflows/ci_check_normal_gm.yml
@@ -14,15 +14,19 @@ jobs:
         with:
           mysql root password: '123456'
       - name: install dependencies
-        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev default-jdk build-essential
+        run: sudo apt-get update && sudo apt-get install -y mysql-client git curl libssl-dev build-essential
       - name: Verify MySQL connection from host
         run: |
           sudo apt-get install -y mysql-client
           mysql -u root --password=123456 -h 127.0.0.1 -P 3306 -e 'status;'
           mysql --host 127.0.0.1 --port 3306 -uroot -p123456 -e "SHOW DATABASES"
-
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_cross_gm_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash -x .ci/ci_cross_gm_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash -x .ci/ci_cross_gm_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_normal_gm_mac.yml b/.github/workflows/ci_check_normal_gm_mac.yml
@@ -22,8 +22,13 @@ jobs:
         run: |
           which openssl
           openssl version
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_cross_gm_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
-        run: bash .ci/ci_cross_gm_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
+        run: java -version && bash .ci/ci_cross_gm_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:
           CI_DB_PASSWORD : '123456'
diff --git a/.github/workflows/ci_check_unittest.yml b/.github/workflows/ci_check_unittest.yml
@@ -10,11 +10,12 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 1.8.0.382
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'zulu'
+          java-version: '8.0.382'
       - name: run ci_check.sh
-        run: bash .ci/ci_check.sh
+        run: java -version && bash .ci/ci_check.sh
       - name: upload coverage
         run: bash <(curl -s https://codecov.io/bash)
diff --git a/.github/workflows/publish_binary.yml b/.github/workflows/publish_binary.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew assemble
     - name: Download plugin
-      run: cd dist/ && bash download_plugin.sh ALL v1.3.1 && bash download_pages.sh v1.3.1  && rm -rf src && cd -
+      run: cd dist/ && bash download_plugin.sh ALL v1.4.0 && bash download_pages.sh v1.4.0  && rm -rf src && cd -
     - name: Pack
       run: chmod +x dist/*.sh && mv dist WeCross && tar -zcvf WeCross.tar.gz WeCross
     - name: Checksum

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ repositories {
 }
 
 sourceCompatibility = '1.8'
-version = '1.3.2-SNAPSHOT'
+version = '1.4.0-SNAPSHOT'
 
 task stubSourceJar(type: Jar) {
     into 'com/webank/wecross/stub', { from 'src/main/java/com/webank/wecross/stub' }

diff --git a/demo/profile_version.sh b/demo/profile_version.sh
@@ -1,19 +1,19 @@
 # WeCross
-WECROSS_VERSION=v1.3.1
+WECROSS_VERSION=v1.4.0
 # WeCross Console
-WECROSS_CONSOLE_VERSION=v1.3.1
+WECROSS_CONSOLE_VERSION=v1.4.0
 # WeCross Account Manager
-WECROSS_ACCOUNT_MANAGER_VERSION=v1.3.1
+WECROSS_ACCOUNT_MANAGER_VERSION=v1.4.0
 # WeCross BCOS2.0 Stub
-WECROSS_BCOS2_STUB_VERSION=v1.3.1
+WECROSS_BCOS2_STUB_VERSION=v1.4.0
 # WeCross BCOS3.0 Stub
-WECROSS_BCOS3_STUB_VERSION=v1.3.1
+WECROSS_BCOS3_STUB_VERSION=v1.4.0
 # WeCross Fabric1.4 Stub
-WECROSS_FABRIC1_STUB_VERSION=v1.3.1
+WECROSS_FABRIC1_STUB_VERSION=v1.4.0
 # WeCross Fabric2.0 Stub
-WECROSS_FABRIC2_STUB_VERSION=v1.3.1
+WECROSS_FABRIC2_STUB_VERSION=v1.4.0
 # WeCross Java SDK
-WECROSS_JAVA_SDK_VERSION=v1.3.1
+WECROSS_JAVA_SDK_VERSION=v1.4.0
 
 # FISCO BCOS
 BCOS_VERSION=v2.9.1

diff --git a/release_note.txt b/release_note.txt
@@ -1 +1 @@
-v1.3.1
+v1.4.0
diff --git a/scripts/build_wecross.sh b/scripts/build_wecross.sh
@@ -53,7 +53,7 @@ EOF
 check_env() {
     # shellcheck disable=SC2143
     # shellcheck disable=SC2236
-    [ ! -z "$(openssl version | grep 1.0.2)" ] || [ ! -z "$(openssl version | grep 1.1)" ] || [ ! -z "$(openssl version | grep reSSL)" ] || {
+    [ ! -z "$(openssl version | grep 1.0.2)" ] || [ ! -z "$(openssl version | grep 1.1)" ] || [ ! -z "$(openssl version | grep 3.)" ] || [ ! -z "$(openssl version | grep reSSL)" ] || {
         LOG_ERROR "Please install openssl!"
         #echo "download openssl from https://www.openssl.org."
         LOG_INFO "Use \"openssl version\" command to check."

diff --git a/scripts/create_cert.sh b/scripts/create_cert.sh
@@ -49,7 +49,7 @@ LOG_FALT() {
 check_env() {
     # shellcheck disable=SC2143
     # shellcheck disable=SC2236
-    [ ! -z "$(openssl version | grep 1.0.2)" ] || [ ! -z "$(openssl version | grep 1.1)" ] || [ ! -z "$(openssl version | grep reSSL)" ] || {
+    [ ! -z "$(openssl version | grep 1.0.2)" ] || [ ! -z "$(openssl version | grep 1.1)" ] || [ ! -z "$(openssl version | grep 3.)" ] || [ ! -z "$(openssl version | grep reSSL)" ] || {
         LOG_ERROR "Please install openssl!"
         #echo "download openssl from https://www.openssl.org."
         LOG_INFO "Use \"openssl version\" command to check."

diff --git a/scripts/download_account_manager.sh b/scripts/download_account_manager.sh
@@ -3,7 +3,7 @@ set -e
 
 LANG=en_US.UTF-8
 
-default_compatibility_version=v1.3.1 # update this every release
+default_compatibility_version=v1.4.0 # update this every release
 
 compatibility_version=
 enable_build_from_resource=0

diff --git a/scripts/download_console.sh b/scripts/download_console.sh
@@ -3,7 +3,7 @@ set -e
 
 LANG=en_US.UTF-8
 
-default_compatibility_version=v1.3.1 # update this every release
+default_compatibility_version=v1.4.0 # update this every release
 BCOS_VERSION=v2.7.2  # use this version to specify get_account script
 
 compatibility_version=

diff --git a/scripts/download_demo.sh b/scripts/download_demo.sh
@@ -3,7 +3,7 @@ set -e
 
 LANG=en_US.UTF-8
 
-default_compatibility_version=v1.3.1 # update this every release
+default_compatibility_version=v1.4.0 # update this every release
 
 compatibility_version=
 GIT_URL_BASE='github.com'

diff --git a/scripts/download_pages.sh b/scripts/download_pages.sh
@@ -34,7 +34,7 @@ Usage:
     bash $0  <tag/branch>
     <tag/branch>:   certain tag or branch to download
 e.g
-    bash $0 v1.3.1
+    bash $0 v1.4.0
 EOF
     exit 0
 }

diff --git a/scripts/download_plugin.sh b/scripts/download_plugin.sh
@@ -50,10 +50,10 @@ Usage:
 
     <tag/branch>:   certain tag or branch to download
 e.g
-    bash $0 BCOS2 v1.3.1
-    bash $0 BCOS3 v1.3.1
-    bash $0 Fabric1 v1.3.1
-    bash $0 Fabric2 v1.3.1
+    bash $0 BCOS2 v1.4.0
+    bash $0 BCOS3 v1.4.0
+    bash $0 Fabric1 v1.4.0
+    bash $0 Fabric2 v1.4.0
 EOF
     exit 0
 }

diff --git a/scripts/download_wecross.sh b/scripts/download_wecross.sh
@@ -6,7 +6,7 @@ LANG=en_US.UTF-8
 enable_build_from_resource=0
 compatibility_version=
 
-default_compatibility_version=v1.3.1 # update this every release
+default_compatibility_version=v1.4.0 # update this every release
 deps_dir=$(pwd)'/WeCross/plugin/'
 pages_dir=$(pwd)'/WeCross/pages/'
 src_dir=$(pwd)'/src/'

diff --git a/src/main/java/com/webank/wecross/common/WeCrossDefault.java b/src/main/java/com/webank/wecross/common/WeCrossDefault.java
@@ -4,7 +4,7 @@
 import java.util.List;
 
 public class WeCrossDefault {
-    public static final String VERSION = "v1.3.1";
+    public static final String VERSION = "v1.4.0";
 
     public static final String TEMPLATE_URL = "http://127.0.0.1:8080/";