Skip to content

Commit e7ded95

Browse files
committed
<fix>(tools): fix get_account.sh issue.
1 parent 0131a89 commit e7ded95

4 files changed

Lines changed: 43 additions & 38 deletions

File tree

.ci/ci_check.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@ prepare_environment()
7676

7777
build_node()
7878
{
79-
curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.0.0/get_account.sh
80-
curl -LO https://github.com/FISCO-BCOS/console/releases/download/v3.0.0/get_gm_account.sh
79+
cp ./tools/get_account.sh .
80+
cp ./tools/get_gm_account.sh .
81+
mkdir ~/.fisco
82+
cp ./tools/get_account.sh ~/.fisco/
83+
cp ./tools/get_gm_account.sh ~/.fisco/
8184
bash build_chain.sh -l 127.0.0.1:4 ${@} -e ./fisco-bcos
8285
./nodes/127.0.0.1/fisco-bcos -v
8386
./nodes/127.0.0.1/start_all.sh
@@ -177,9 +180,9 @@ java -version
177180
#cp src/integration-test/resources/config-example.toml src/integration-test/resources/config.toml
178181
download_tassl
179182

180-
LOG_INFO "------ download_binary: v3.11.0---------"
181-
download_binary "v3.11.0"
182-
download_build_chain "v3.11.0"
183+
LOG_INFO "------ download_binary: v3.15.2---------"
184+
download_binary "v3.15.2"
185+
download_build_chain "v3.15.2"
183186
LOG_INFO "------ check_standard_node---------"
184187
check_standard_node false
185188
LOG_INFO "------ check_sm_node---------"

.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
- run:
2020
name: Compile
2121
command: |
22+
export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java))))
2223
bash gradlew build
2324
- run:
2425
name: Integration Test

.github/workflows/workflow.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
os: [ubuntu-20.04, ubuntu-22.04, windows-2019, macos-12]
17+
os: [ubuntu-22.04, windows-2019, macos-latest]
1818
steps:
1919
- uses: actions/checkout@v2
2020
with:
@@ -37,32 +37,32 @@ jobs:
3737
if: runner.os != 'Windows'
3838
run: /bin/bash -x .ci/ci_check.sh
3939

40-
build-centos:
41-
name: build-centos
42-
runs-on: ${{ matrix.os }}
43-
continue-on-error: true
44-
strategy:
45-
fail-fast: false
46-
matrix:
47-
os: [ ubuntu-20.04 ]
48-
container: docker.io/centos:latest
49-
steps:
50-
- uses: actions/checkout@v2
51-
with:
52-
fetch-depth: 5
53-
- name: install CentOS dependencies
54-
run: |
55-
cd /etc/yum.repos.d/
56-
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
57-
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
58-
yum update -y
59-
yum install -y which git openssl-devel openssl wget
60-
- name: Set up JDK 1.8
61-
uses: actions/setup-java@v3
62-
with:
63-
distribution: 'zulu'
64-
java-version: '8.0.382'
65-
- name: run integration testing
66-
run: /bin/bash -x .ci/ci_check.sh
67-
- name: upload coverage
68-
run: curl -LO https://codecov.io/bash && /bin/bash ./bash
40+
# build-centos:
41+
# name: build-centos
42+
# runs-on: ${{ matrix.os }}
43+
# continue-on-error: true
44+
# strategy:
45+
# fail-fast: false
46+
# matrix:
47+
# os: [ ubuntu-22.04 ]
48+
# container: docker.io/centos:latest
49+
# steps:
50+
# - uses: actions/checkout@v2
51+
# with:
52+
# fetch-depth: 5
53+
# - name: install CentOS dependencies
54+
# run: |
55+
# cd /etc/yum.repos.d/
56+
# sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
57+
# sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
58+
# yum update -y
59+
# yum install -y which git openssl-devel openssl wget
60+
# - name: Set up JDK 1.8
61+
# uses: actions/setup-java@v3
62+
# with:
63+
# distribution: 'zulu'
64+
# java-version: '8.0.382'
65+
# - name: run integration testing
66+
# run: /bin/bash -x .ci/ci_check.sh
67+
# - name: upload coverage
68+
# run: curl -LO https://codecov.io/bash && /bin/bash ./bash

tools/get_account.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,15 @@ LOG_INFO()
5454
echo -e "\033[32m[INFO] ${content}\033[0m"
5555
}
5656

57-
check_env() {
58-
[ ! -z "$(openssl version | grep 1.0.2)" ] || [ ! -z "$(openssl version | grep 1.1)" ] || [ ! -z "$(openssl version | grep '3.')" ] || [ ! -z "$(openssl version | grep reSSL)" ] || {
57+
check_env()
58+
{
59+
if [ ! -z "$(openssl version | grep 1.0.2)" ] || [ ! -z "$(openssl version | grep 1.1)" ] || [ ! -z "$(openssl version | grep '3.')" ] || [ ! -z "$(openssl version | grep reSSL)" ];then
5960
echo "please install openssl! use \"openssl version\" command to check."
6061
LOG_INFO " Ubuntu : sudo apt install -y openssl"
6162
LOG_INFO " CentOS : sudo yum install -y openssl"
6263
LOG_INFO " macOS : brew install -y openssl"
6364
exit 1
64-
}
65+
fi
6566
if [ ! -z "$(openssl version | grep reSSL)" ];then
6667
export PATH="/usr/local/opt/openssl/bin:$PATH"
6768
fi

0 commit comments

Comments
 (0)