Skip to content

Commit 22ce064

Browse files
learnforpracticelearnforpractice
committed
merge from eos/master
1 parent 37c8a8d commit 22ce064

File tree

131 files changed

+5366
-2779
lines changed

Some content is hidden

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

131 files changed

+5366
-2779
lines changed

‎.buildkite/coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- command: |
33
echo "--- :hammer: Building" && \
4-
/usr/bin/cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DWASM_ROOT=/root/opt/wasm -DOPENSSL_ROOT_DIR=/usr/include/openssl -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
4+
/usr/bin/cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_COMPILER=clang-4.0 -DBOOST_ROOT="${BOOST_ROOT}" -DWASM_ROOT="${WASM_ROOT}" -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DBUILD_MONGO_DB_PLUGIN=true -DENABLE_COVERAGE_TESTING=true -DBUILD_DOXYGEN=false && \
55
/usr/bin/ninja
66
echo "--- :spiral_note_pad: Generating Code Coverage Report" && \
77
/usr/bin/ninja EOSIO_ut_coverage && \
@@ -15,13 +15,13 @@ steps:
1515
agents:
1616
- "role=linux-coverage"
1717
plugins:
18-
docker#v1.1.1:
18+
docker#v1.4.0:
1919
image: "eosio/ci:ubuntu18"
2020
workdir: /data/job
2121
mounts:
2222
- /etc/buildkite-agent/config:/config
2323
environment:
24-
- BOOST_ROOT=/root/opt/boost_1_67_0
24+
- BOOST_ROOT=/root/opt/boost
2525
- OPENSSL_ROOT_DIR=/usr/include/openssl
2626
- WASM_ROOT=/root/opt/wasm
2727
- PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/opt/wasm/bin

‎.buildkite/debug.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
- "role=linux-builder"
2323
artifact_paths: "build.tar.gz"
2424
plugins:
25-
docker#v1.1.1:
25+
docker#v1.4.0:
2626
image: "eosio/ci:ubuntu"
2727
workdir: /data/job
2828
timeout: 60
@@ -37,7 +37,7 @@ steps:
3737
- "role=linux-builder"
3838
artifact_paths: "build.tar.gz"
3939
plugins:
40-
docker#v1.1.1:
40+
docker#v1.4.0:
4141
image: "eosio/ci:ubuntu18"
4242
workdir: /data/job
4343
timeout: 60
@@ -52,7 +52,7 @@ steps:
5252
- "role=linux-builder"
5353
artifact_paths: "build.tar.gz"
5454
plugins:
55-
docker#v1.1.1:
55+
docker#v1.4.0:
5656
image: "eosio/ci:fedora"
5757
workdir: /data/job
5858
timeout: 60
@@ -67,7 +67,7 @@ steps:
6767
- "role=linux-builder"
6868
artifact_paths: "build.tar.gz"
6969
plugins:
70-
docker#v1.1.1:
70+
docker#v1.4.0:
7171
image: "eosio/ci:centos"
7272
workdir: /data/job
7373
timeout: 60
@@ -82,7 +82,7 @@ steps:
8282
- "role=linux-builder"
8383
artifact_paths: "build.tar.gz"
8484
plugins:
85-
docker#v1.1.1:
85+
docker#v1.4.0:
8686
image: "eosio/ci:amazonlinux"
8787
workdir: /data/job
8888
timeout: 60
@@ -128,7 +128,7 @@ steps:
128128
- "build/genesis.json"
129129
- "build/config.ini"
130130
plugins:
131-
docker#v1.1.1:
131+
docker#v1.4.0:
132132
image: "eosio/ci:ubuntu"
133133
workdir: /data/job
134134
timeout: 60
@@ -152,7 +152,7 @@ steps:
152152
- "build/genesis.json"
153153
- "build/config.ini"
154154
plugins:
155-
docker#v1.1.1:
155+
docker#v1.4.0:
156156
image: "eosio/ci:ubuntu18"
157157
workdir: /data/job
158158
timeout: 60
@@ -176,7 +176,7 @@ steps:
176176
- "build/genesis.json"
177177
- "build/config.ini"
178178
plugins:
179-
docker#v1.1.1:
179+
docker#v1.4.0:
180180
image: "eosio/ci:fedora"
181181
workdir: /data/job
182182
timeout: 60
@@ -200,7 +200,7 @@ steps:
200200
- "build/genesis.json"
201201
- "build/config.ini"
202202
plugins:
203-
docker#v1.1.1:
203+
docker#v1.4.0:
204204
image: "eosio/ci:centos"
205205
workdir: /data/job
206206
timeout: 60
@@ -224,7 +224,7 @@ steps:
224224
- "build/genesis.json"
225225
- "build/config.ini"
226226
plugins:
227-
docker#v1.1.1:
227+
docker#v1.4.0:
228228
image: "eosio/ci:amazonlinux"
229229
workdir: /data/job
230230
timeout: 60

‎.buildkite/long_running_tests.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
- "role=linux-builder"
2323
artifact_paths: "build.tar.gz"
2424
plugins:
25-
docker#v1.1.1:
25+
docker#v1.4.0:
2626
image: "eosio/ci:ubuntu"
2727
workdir: /data/job
2828
timeout: 60
@@ -37,7 +37,7 @@ steps:
3737
- "role=linux-builder"
3838
artifact_paths: "build.tar.gz"
3939
plugins:
40-
docker#v1.1.1:
40+
docker#v1.4.0:
4141
image: "eosio/ci:ubuntu18"
4242
workdir: /data/job
4343
timeout: 60
@@ -52,7 +52,7 @@ steps:
5252
- "role=linux-builder"
5353
artifact_paths: "build.tar.gz"
5454
plugins:
55-
docker#v1.1.1:
55+
docker#v1.4.0:
5656
image: "eosio/ci:fedora"
5757
workdir: /data/job
5858
timeout: 60
@@ -67,7 +67,7 @@ steps:
6767
- "role=linux-builder"
6868
artifact_paths: "build.tar.gz"
6969
plugins:
70-
docker#v1.1.1:
70+
docker#v1.4.0:
7171
image: "eosio/ci:centos"
7272
workdir: /data/job
7373
timeout: 60
@@ -82,7 +82,7 @@ steps:
8282
- "role=linux-builder"
8383
artifact_paths: "build.tar.gz"
8484
plugins:
85-
docker#v1.1.1:
85+
docker#v1.4.0:
8686
image: "eosio/ci:amazonlinux"
8787
workdir: /data/job
8888
timeout: 60
@@ -128,7 +128,7 @@ steps:
128128
- "build/genesis.json"
129129
- "build/config.ini"
130130
plugins:
131-
docker#v1.1.1:
131+
docker#v1.4.0:
132132
image: "eosio/ci:ubuntu"
133133
workdir: /data/job
134134
timeout: 60
@@ -152,7 +152,7 @@ steps:
152152
- "build/genesis.json"
153153
- "build/config.ini"
154154
plugins:
155-
docker#v1.1.1:
155+
docker#v1.4.0:
156156
image: "eosio/ci:ubuntu18"
157157
workdir: /data/job
158158
timeout: 60
@@ -176,7 +176,7 @@ steps:
176176
- "build/genesis.json"
177177
- "build/config.ini"
178178
plugins:
179-
docker#v1.1.1:
179+
docker#v1.4.0:
180180
image: "eosio/ci:fedora"
181181
workdir: /data/job
182182
timeout: 60
@@ -200,7 +200,7 @@ steps:
200200
- "build/genesis.json"
201201
- "build/config.ini"
202202
plugins:
203-
docker#v1.1.1:
203+
docker#v1.4.0:
204204
image: "eosio/ci:centos"
205205
workdir: /data/job
206206
timeout: 60
@@ -224,7 +224,7 @@ steps:
224224
- "build/genesis.json"
225225
- "build/config.ini"
226226
plugins:
227-
docker#v1.1.1:
227+
docker#v1.4.0:
228228
image: "eosio/ci:amazonlinux"
229229
workdir: /data/job
230230
timeout: 60

‎.buildkite/pipeline.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
- "role=linux-builder"
2323
artifact_paths: "build.tar.gz"
2424
plugins:
25-
docker#v1.1.1:
25+
docker#v1.4.0:
2626
image: "eosio/ci:ubuntu"
2727
workdir: /data/job
2828
timeout: 60
@@ -37,7 +37,7 @@ steps:
3737
- "role=linux-builder"
3838
artifact_paths: "build.tar.gz"
3939
plugins:
40-
docker#v1.1.1:
40+
docker#v1.4.0:
4141
image: "eosio/ci:ubuntu18"
4242
workdir: /data/job
4343
timeout: 60
@@ -52,7 +52,7 @@ steps:
5252
- "role=linux-builder"
5353
artifact_paths: "build.tar.gz"
5454
plugins:
55-
docker#v1.1.1:
55+
docker#v1.4.0:
5656
image: "eosio/ci:fedora"
5757
workdir: /data/job
5858
timeout: 60
@@ -67,7 +67,7 @@ steps:
6767
- "role=linux-builder"
6868
artifact_paths: "build.tar.gz"
6969
plugins:
70-
docker#v1.1.1:
70+
docker#v1.4.0:
7171
image: "eosio/ci:centos"
7272
workdir: /data/job
7373
timeout: 60
@@ -82,7 +82,7 @@ steps:
8282
- "role=linux-builder"
8383
artifact_paths: "build.tar.gz"
8484
plugins:
85-
docker#v1.1.1:
85+
docker#v1.4.0:
8686
image: "eosio/ci:amazonlinux"
8787
workdir: /data/job
8888
timeout: 60
@@ -128,7 +128,7 @@ steps:
128128
- "build/genesis.json"
129129
- "build/config.ini"
130130
plugins:
131-
docker#v1.1.1:
131+
docker#v1.4.0:
132132
image: "eosio/ci:ubuntu"
133133
workdir: /data/job
134134
timeout: 60
@@ -152,7 +152,7 @@ steps:
152152
- "build/genesis.json"
153153
- "build/config.ini"
154154
plugins:
155-
docker#v1.1.1:
155+
docker#v1.4.0:
156156
image: "eosio/ci:ubuntu18"
157157
workdir: /data/job
158158
timeout: 60
@@ -176,7 +176,7 @@ steps:
176176
- "build/genesis.json"
177177
- "build/config.ini"
178178
plugins:
179-
docker#v1.1.1:
179+
docker#v1.4.0:
180180
image: "eosio/ci:fedora"
181181
workdir: /data/job
182182
timeout: 60
@@ -200,7 +200,7 @@ steps:
200200
- "build/genesis.json"
201201
- "build/config.ini"
202202
plugins:
203-
docker#v1.1.1:
203+
docker#v1.4.0:
204204
image: "eosio/ci:centos"
205205
workdir: /data/job
206206
timeout: 60
@@ -224,7 +224,7 @@ steps:
224224
- "build/genesis.json"
225225
- "build/config.ini"
226226
plugins:
227-
docker#v1.1.1:
227+
docker#v1.4.0:
228228
image: "eosio/ci:amazonlinux"
229229
workdir: /data/job
230230
timeout: 60

‎CMakeModules/FindSoci.cmake

Lines changed: 0 additions & 97 deletions
This file was deleted.

0 commit comments

Comments
 (0)