Skip to content

Commit bd40332

Browse files
abitmoreabitmore
authored
Merge pull request #2334 from bitshares/release
Merge release branch into master branch for 5.1.0 release
2 parents a06a712 + 0429763 commit bd40332

File tree

89 files changed

+2321
-953
lines changed

Some content is hidden

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

89 files changed

+2321
-953
lines changed

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

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: macOS
2+
on: [ push, pull_request ]
3+
env:
4+
CCACHE_COMPRESS: exists means true
5+
CCACHE_SLOPPINESS: include_file_ctime,include_file_mtime,time_macros
6+
jobs:
7+
build-osx:
8+
name: Build and test in macOS
9+
strategy:
10+
matrix:
11+
os: [macos-10.15, macos-11.0]
12+
runs-on: ${{ matrix.os }}
13+
steps:
14+
- name: Install dependencies
15+
run: |
16+
brew install autoconf automake libtool
17+
brew install ccache
18+
brew install parallel
19+
brew install bitshares/boost/[email protected]
20+
- uses: actions/checkout@v2
21+
with:
22+
submodules: recursive
23+
- name: Configure
24+
run: |
25+
mkdir -p _build
26+
pushd _build
27+
cmake -D CMAKE_BUILD_TYPE=Release \
28+
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
29+
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
30+
-D BOOST_ROOT=/usr/local/opt/[email protected] \
31+
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
32+
..
33+
- name: Load Cache
34+
uses: actions/cache@v1
35+
with:
36+
path: ccache
37+
key: ccache-osx-${{ github.ref }}-${{ github.sha }}
38+
restore-keys: |
39+
ccache-osx-${{ github.ref }}-
40+
ccache-osx-
41+
- name: Build
42+
run: |
43+
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
44+
mkdir -p "$CCACHE_DIR"
45+
make -j 2 -C _build witness_node cli_wallet app_test cli_test chain_test
46+
df -h
47+
- name: Unit-Tests
48+
run: |
49+
_build/tests/app_test -l test_suite
50+
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
51+
_build/tests/cli_test -l test_suite
52+
df -h
53+
- name: Node-Test
54+
run: |
55+
df -h
56+
pushd _build
57+
../programs/build_helpers/run-node-test

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

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
name: Ubuntu Debug
2+
on: [ push, pull_request ]
3+
env:
4+
CCACHE_COMPRESS: exists means true
5+
CCACHE_SLOPPINESS: include_file_ctime,include_file_mtime,time_macros
6+
jobs:
7+
test-debug:
8+
name: Build and test in Debug mode
9+
strategy:
10+
matrix:
11+
os: [ ubuntu-16.04, ubuntu-18.04 ]
12+
runs-on: ${{ matrix.os }}
13+
services:
14+
elasticsearch:
15+
image: docker://elasticsearch:7.4.2
16+
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
17+
steps:
18+
- name: Install dependencies
19+
run: |
20+
df -h
21+
sudo apt-get update
22+
openssl_ver=`sudo apt-cache madison openssl | grep xenial-updates | awk '{print $3}'`
23+
libssl_ver=`sudo apt-cache madison libssl-dev | grep xenial-updates | awk '{print $3}'`
24+
[ -n "${openssl_ver}" ] && [ -n "${libssl_ver}" ] && \
25+
sudo apt-get install -y --allow-downgrades openssl=${openssl_ver} libssl-dev=${libssl_ver}
26+
sudo apt-get install -y \
27+
ccache \
28+
parallel \
29+
libboost-thread-dev \
30+
libboost-iostreams-dev \
31+
libboost-date-time-dev \
32+
libboost-system-dev \
33+
libboost-filesystem-dev \
34+
libboost-program-options-dev \
35+
libboost-chrono-dev \
36+
libboost-test-dev \
37+
libboost-context-dev \
38+
libboost-regex-dev \
39+
libboost-coroutine-dev \
40+
libcurl4-openssl-dev
41+
sudo apt-get auto-remove -y
42+
sudo apt-get clean -y
43+
df -h
44+
sudo du -hs /mnt/*
45+
sudo ls -alr /mnt/
46+
- uses: actions/checkout@v2
47+
with:
48+
submodules: recursive
49+
- name: Configure
50+
run: |
51+
pwd
52+
df -h .
53+
mkdir -p _build
54+
sudo mkdir -p /_build/libraries /_build/programs /mnt/_build/tests
55+
sudo chmod a+rwx /_build/libraries /_build/programs /mnt/_build/tests
56+
ln -s /_build/libraries _build/libraries
57+
ln -s /_build/programs _build/programs
58+
ln -s /mnt/_build/tests _build/tests
59+
sudo ln -s /_build/libraries /mnt/_build/libraries
60+
sudo ln -s /_build/programs /mnt/_build/programs
61+
sudo ln -s /mnt/_build/tests /_build/tests
62+
ls -al _build
63+
pushd _build
64+
export -n BOOST_ROOT BOOST_INCLUDEDIR BOOST_LIBRARYDIR
65+
cmake -D CMAKE_BUILD_TYPE=Debug \
66+
-D CMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON \
67+
-D CMAKE_C_COMPILER=gcc \
68+
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
69+
-D CMAKE_CXX_COMPILER=g++ \
70+
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
71+
..
72+
popd
73+
- name: Load Cache
74+
uses: actions/cache@v1
75+
with:
76+
path: ccache
77+
key: ccache-debug-${{ github.ref }}-${{ github.sha }}
78+
restore-keys: |
79+
ccache-debug-${{ github.ref }}-
80+
ccache-debug-
81+
- name: Build
82+
run: |
83+
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
84+
mkdir -p "$CCACHE_DIR"
85+
df -h
86+
make -j 2 -C _build chain_test
87+
make -j 2 -C _build cli_wallet
88+
make -j 2 -C _build
89+
df -h
90+
du -hs _build/libraries/* _build/programs/* _build/tests/*
91+
du -hs _build/*
92+
du -hs /_build/*
93+
- name: Unit-Tests
94+
run: |
95+
_build/tests/app_test -l test_suite
96+
df -h
97+
_build/tests/es_test -l test_suite
98+
df -h
99+
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
100+
_build/tests/cli_test -l test_suite
101+
df -h
102+
- name: Node-Test
103+
run: |
104+
df -h
105+
pushd _build
106+
../programs/build_helpers/run-node-test
107+
df -h

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

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: Ubuntu Release
2+
on: [ push, pull_request ]
3+
env:
4+
CCACHE_COMPRESS: exists means true
5+
CCACHE_SLOPPINESS: include_file_ctime,include_file_mtime,time_macros
6+
jobs:
7+
test-release:
8+
name: Build and test in Release mode
9+
strategy:
10+
matrix:
11+
os: [ ubuntu-16.04, ubuntu-18.04 ]
12+
runs-on: ${{ matrix.os }}
13+
services:
14+
elasticsearch:
15+
image: docker://elasticsearch:7.4.2
16+
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
17+
steps:
18+
- name: Install dependencies
19+
run: |
20+
sudo apt-get update
21+
openssl_ver=`sudo apt-cache madison openssl | grep xenial-updates | awk '{print $3}'`
22+
libssl_ver=`sudo apt-cache madison libssl-dev | grep xenial-updates | awk '{print $3}'`
23+
[ -n "${openssl_ver}" ] && [ -n "${libssl_ver}" ] && \
24+
sudo apt-get install -y --allow-downgrades openssl=${openssl_ver} libssl-dev=${libssl_ver}
25+
sudo apt-get install -y \
26+
ccache \
27+
parallel \
28+
libboost-thread-dev \
29+
libboost-iostreams-dev \
30+
libboost-date-time-dev \
31+
libboost-system-dev \
32+
libboost-filesystem-dev \
33+
libboost-program-options-dev \
34+
libboost-chrono-dev \
35+
libboost-test-dev \
36+
libboost-context-dev \
37+
libboost-regex-dev \
38+
libboost-coroutine-dev \
39+
libcurl4-openssl-dev
40+
sudo apt-get auto-remove -y
41+
sudo apt-get clean -y
42+
df -h
43+
- uses: actions/checkout@v2
44+
with:
45+
submodules: recursive
46+
- name: Configure
47+
run: |
48+
mkdir -p _build
49+
pushd _build
50+
export -n BOOST_ROOT BOOST_INCLUDEDIR BOOST_LIBRARYDIR
51+
cmake -D CMAKE_BUILD_TYPE=Release \
52+
-D CMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON \
53+
-D CMAKE_C_COMPILER=gcc \
54+
-D CMAKE_C_COMPILER_LAUNCHER=ccache \
55+
-D CMAKE_CXX_COMPILER=g++ \
56+
-D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
57+
..
58+
popd
59+
- name: Load Cache
60+
uses: actions/cache@v1
61+
with:
62+
path: ccache
63+
key: ccache-release-${{ github.ref }}-${{ github.sha }}
64+
restore-keys: |
65+
ccache-release-${{ github.ref }}-
66+
ccache-release-
67+
- name: Build
68+
run: |
69+
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
70+
mkdir -p "$CCACHE_DIR"
71+
make -j 2 -C _build
72+
df -h
73+
- name: Unit-Tests
74+
run: |
75+
_build/tests/app_test -l test_suite
76+
_build/tests/es_test -l test_suite
77+
libraries/fc/tests/run-parallel-tests.sh _build/tests/chain_test -l test_suite
78+
_build/tests/cli_test -l test_suite
79+
df -h
80+
- name: Node-Test
81+
run: |
82+
df -h
83+
pushd _build
84+
../programs/build_helpers/run-node-test
85+
df -h

0 commit comments

Comments
 (0)