Skip to content

Commit 1f3e2e9

Browse files
abitmoreabitmore
authored
Merge pull request #2425 from bitshares/release
Merge release into master for 5.2.0 release
2 parents bd40332 + 34341ee commit 1f3e2e9

File tree

101 files changed

+3922
-2036
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3922
-2036
lines changed

‎.github/workflows/build-and-test.mac.yml‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ jobs:
3131
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
3232
..
3333
- name: Load Cache
34-
uses: actions/cache@v1
34+
uses: actions/cache@v2
3535
with:
3636
path: ccache
37-
key: ccache-osx-${{ github.ref }}-${{ github.sha }}
37+
key: ccache-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}
3838
restore-keys: |
39-
ccache-osx-${{ github.ref }}-
40-
ccache-osx-
39+
ccache-${{ matrix.os }}-${{ github.ref }}-
40+
ccache-${{ matrix.os }}-
4141
- name: Build
4242
run: |
4343
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
@@ -50,6 +50,33 @@ jobs:
5050
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
5151
_build/tests/cli_test -l test_suite
5252
df -h
53+
- name: Quick test for program arguments
54+
run: |
55+
_build/programs/witness_node/witness_node --version
56+
_build/programs/witness_node/witness_node --help
57+
if _build/programs/witness_node/witness_node --bad-arg ; then \
58+
echo "Fail: did not get expected error."; false; \
59+
else \
60+
echo "Pass: got expected error."; \
61+
fi
62+
if _build/programs/witness_node/witness_node --plugins "account_history elasticsearch" ; then \
63+
echo "Fail: did not get expected error."; false; \
64+
else \
65+
echo "Pass: got expected error."; \
66+
fi
67+
if _build/programs/witness_node/witness_node --rpc-endpoint --plugins "witness"; then \
68+
echo "Fail: did not get expected error."; false; \
69+
else \
70+
echo "Pass: got expected error."; \
71+
fi
72+
_build/programs/cli_wallet/cli_wallet --version
73+
_build/programs/cli_wallet/cli_wallet --help
74+
_build/programs/cli_wallet/cli_wallet --suggest-brain-key
75+
if _build/programs/cli_wallet/cli_wallet --bad-arg ; then \
76+
echo "Fail: did not get expected error."; false; \
77+
else \
78+
echo "Pass: got expected error."; \
79+
fi
5380
- name: Node-Test
5481
run: |
5582
df -h

‎.github/workflows/build-and-test.ubuntu-debug.yml‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
name: Build and test in Debug mode
99
strategy:
1010
matrix:
11-
os: [ ubuntu-16.04, ubuntu-18.04 ]
11+
os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04 ]
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch:
15-
image: docker://elasticsearch:7.4.2
15+
image: docker://elasticsearch:7.10.1
1616
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
1717
steps:
1818
- name: Install dependencies
@@ -71,20 +71,22 @@ jobs:
7171
..
7272
popd
7373
- name: Load Cache
74-
uses: actions/cache@v1
74+
uses: actions/cache@v2
7575
with:
7676
path: ccache
77-
key: ccache-debug-${{ github.ref }}-${{ github.sha }}
77+
key: ccache-debug-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}
7878
restore-keys: |
79-
ccache-debug-${{ github.ref }}-
80-
ccache-debug-
79+
ccache-debug-${{ matrix.os }}-${{ github.ref }}-
80+
ccache-debug-${{ matrix.os }}-
8181
- name: Build
8282
run: |
8383
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
8484
mkdir -p "$CCACHE_DIR"
8585
df -h
8686
make -j 2 -C _build chain_test
87+
make -j 2 -C _build cli_test
8788
make -j 2 -C _build cli_wallet
89+
make -j 2 -C _build witness_node
8890
make -j 2 -C _build
8991
df -h
9092
du -hs _build/libraries/* _build/programs/* _build/tests/*
@@ -94,11 +96,41 @@ jobs:
9496
run: |
9597
_build/tests/app_test -l test_suite
9698
df -h
99+
curl -XPUT -H "Content-Type: application/json" http://localhost:9200/_cluster/settings \
100+
-d '{ "transient": { "cluster.routing.allocation.disk.threshold_enabled": false } }'
101+
echo
97102
_build/tests/es_test -l test_suite
98103
df -h
99104
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
100105
_build/tests/cli_test -l test_suite
101106
df -h
107+
- name: Quick test for program arguments
108+
run: |
109+
_build/programs/witness_node/witness_node --version
110+
_build/programs/witness_node/witness_node --help
111+
if _build/programs/witness_node/witness_node --bad-arg ; then \
112+
echo "Fail: did not get expected error."; false; \
113+
else \
114+
echo "Pass: got expected error."; \
115+
fi
116+
if _build/programs/witness_node/witness_node --plugins "account_history elasticsearch" ; then \
117+
echo "Fail: did not get expected error."; false; \
118+
else \
119+
echo "Pass: got expected error."; \
120+
fi
121+
if _build/programs/witness_node/witness_node --rpc-endpoint --plugins "witness"; then \
122+
echo "Fail: did not get expected error."; false; \
123+
else \
124+
echo "Pass: got expected error."; \
125+
fi
126+
_build/programs/cli_wallet/cli_wallet --version
127+
_build/programs/cli_wallet/cli_wallet --help
128+
_build/programs/cli_wallet/cli_wallet --suggest-brain-key
129+
if _build/programs/cli_wallet/cli_wallet --bad-arg ; then \
130+
echo "Fail: did not get expected error."; false; \
131+
else \
132+
echo "Pass: got expected error."; \
133+
fi
102134
- name: Node-Test
103135
run: |
104136
df -h

‎.github/workflows/build-and-test.ubuntu-release.yml‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
name: Build and test in Release mode
99
strategy:
1010
matrix:
11-
os: [ ubuntu-16.04, ubuntu-18.04 ]
11+
os: [ ubuntu-16.04, ubuntu-18.04, ubuntu-20.04 ]
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch:
15-
image: docker://elasticsearch:7.4.2
15+
image: docker://elasticsearch:7.10.1
1616
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
1717
steps:
1818
- name: Install dependencies
@@ -57,13 +57,13 @@ jobs:
5757
..
5858
popd
5959
- name: Load Cache
60-
uses: actions/cache@v1
60+
uses: actions/cache@v2
6161
with:
6262
path: ccache
63-
key: ccache-release-${{ github.ref }}-${{ github.sha }}
63+
key: ccache-release-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}
6464
restore-keys: |
65-
ccache-release-${{ github.ref }}-
66-
ccache-release-
65+
ccache-release-${{ matrix.os }}-${{ github.ref }}-
66+
ccache-release-${{ matrix.os }}-
6767
- name: Build
6868
run: |
6969
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
@@ -73,10 +73,40 @@ jobs:
7373
- name: Unit-Tests
7474
run: |
7575
_build/tests/app_test -l test_suite
76+
curl -XPUT -H "Content-Type: application/json" http://localhost:9200/_cluster/settings \
77+
-d '{ "transient": { "cluster.routing.allocation.disk.threshold_enabled": false } }'
78+
echo
7679
_build/tests/es_test -l test_suite
7780
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
7881
_build/tests/cli_test -l test_suite
7982
df -h
83+
- name: Quick test for program arguments
84+
run: |
85+
_build/programs/witness_node/witness_node --version
86+
_build/programs/witness_node/witness_node --help
87+
if _build/programs/witness_node/witness_node --bad-arg ; then \
88+
echo "Fail: did not get expected error."; false; \
89+
else \
90+
echo "Pass: got expected error."; \
91+
fi
92+
if _build/programs/witness_node/witness_node --plugins "account_history elasticsearch" ; then \
93+
echo "Fail: did not get expected error."; false; \
94+
else \
95+
echo "Pass: got expected error."; \
96+
fi
97+
if _build/programs/witness_node/witness_node --rpc-endpoint --plugins "witness"; then \
98+
echo "Fail: did not get expected error."; false; \
99+
else \
100+
echo "Pass: got expected error."; \
101+
fi
102+
_build/programs/cli_wallet/cli_wallet --version
103+
_build/programs/cli_wallet/cli_wallet --help
104+
_build/programs/cli_wallet/cli_wallet --suggest-brain-key
105+
if _build/programs/cli_wallet/cli_wallet --bad-arg ; then \
106+
echo "Fail: did not get expected error."; false; \
107+
else \
108+
echo "Pass: got expected error."; \
109+
fi
80110
- name: Node-Test
81111
run: |
82112
df -h

‎.github/workflows/build-and-test.win.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Download library sources
3131
if: steps.cache-libs.outputs.cache-hit != 'true'
3232
run: |
33-
curl -LO https://dl.bintray.com/boostorg/release/${{ env.BOOST_DOTTED_VERSION }}/source/boost_${{ env.BOOST_VERSION }}.tar.bz2
33+
curl -LO https://boostorg.jfrog.io/artifactory/main/release/${{ env.BOOST_DOTTED_VERSION }}/source/boost_${{ env.BOOST_VERSION }}.tar.bz2
3434
curl -LO https://curl.haxx.se/download/curl-${{ env.CURL_VERSION }}.tar.bz2
3535
curl -LO https://www.openssl.org/source/openssl-${{ env.OPENSSL_VERSION }}.tar.gz
3636
curl -LO https://zlib.net/zlib-${{ env.ZLIB_VERSION }}.tar.gz

0 commit comments

Comments
 (0)