Skip to content

Commit a24015f

Browse files
GaspardKiriraGaspardKirira
committed
ci(cli): include p2p and crypto modules in strict CI
2 parents 1eaf86a + 67a8751 commit a24015f

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

‎.github/workflows/cli-strict-ci.yml‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
sudo apt-get install -y $DEPS
8484
test -f /usr/include/asio.hpp || (echo "::error::System Asio header not found after install"; exit 1)
8585
86-
- name: Prepare Asio layout for local async/core builds
86+
- name: Prepare Asio layout for local core builds
8787
run: |
8888
set -e
8989
mkdir -p /tmp/vix-asio/include
@@ -92,14 +92,15 @@ jobs:
9292
9393
- name: Fetch sibling dependencies
9494
run: |
95-
rm -rf ../core ../utils ../async ../json ../template ../p2p
95+
rm -rf ../core ../utils ../async ../json ../template ../p2p ../crypto
9696
9797
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/core.git ../core
9898
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
9999
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
100100
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
101101
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
102102
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/p2p.git ../p2p
103+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/crypto.git ../crypto
103104
104105
git -C ../async submodule update --init --recursive --depth 1 || true
105106
@@ -115,17 +116,19 @@ jobs:
115116
ls -la ../json || true
116117
ls -la ../template || true
117118
ls -la ../p2p || true
119+
ls -la ../crypto || true
118120
119121
- name: Verify required sibling dependencies
120122
run: |
121123
test -f ../core/CMakeLists.txt || (echo "::error::../core/CMakeLists.txt is missing"; exit 1)
122124
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
123125
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
124126
test -f ../p2p/CMakeLists.txt || (echo "::error::../p2p/CMakeLists.txt is missing"; exit 1)
127+
test -f ../crypto/CMakeLists.txt || (echo "::error::../crypto/CMakeLists.txt is missing"; exit 1)
125128
126129
- name: Export dependency include paths
127130
run: |
128-
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include"
131+
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include:$GITHUB_WORKSPACE/../crypto/include"
129132
if [ -d "$GITHUB_WORKSPACE/../json/include" ]; then
130133
EXTRA_PATHS="$EXTRA_PATHS:$GITHUB_WORKSPACE/../json/include"
131134
fi
@@ -177,7 +180,7 @@ jobs:
177180
sudo apt-get install -y $DEPS
178181
test -f /usr/include/asio.hpp || (echo "::error::System Asio header not found after install"; exit 1)
179182
180-
- name: Prepare Asio layout for local async/core builds
183+
- name: Prepare Asio layout for local core builds
181184
run: |
182185
set -e
183186
mkdir -p /tmp/vix-asio/include
@@ -186,14 +189,15 @@ jobs:
186189
187190
- name: Fetch sibling dependencies
188191
run: |
189-
rm -rf ../core ../utils ../async ../json ../template ../p2p
192+
rm -rf ../core ../utils ../async ../json ../template ../p2p ../crypto
190193
191194
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/core.git ../core
192195
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
193196
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
194197
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
195198
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
196199
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/p2p.git ../p2p
200+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/crypto.git ../crypto
197201
198202
git -C ../async submodule update --init --recursive --depth 1 || true
199203
@@ -207,10 +211,11 @@ jobs:
207211
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
208212
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
209213
test -f ../p2p/CMakeLists.txt || (echo "::error::../p2p/CMakeLists.txt is missing"; exit 1)
214+
test -f ../crypto/CMakeLists.txt || (echo "::error::../crypto/CMakeLists.txt is missing"; exit 1)
210215
211216
- name: Export dependency include paths
212217
run: |
213-
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include"
218+
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include:$GITHUB_WORKSPACE/../crypto/include"
214219
if [ -d "$GITHUB_WORKSPACE/../json/include" ]; then
215220
EXTRA_PATHS="$EXTRA_PATHS:$GITHUB_WORKSPACE/../json/include"
216221
fi
@@ -286,7 +291,7 @@ jobs:
286291
sudo apt-get install -y $DEPS
287292
test -f /usr/include/asio.hpp || (echo "::error::System Asio header not found after install"; exit 1)
288293
289-
- name: Prepare Asio layout for local async/core builds
294+
- name: Prepare Asio layout for local core builds
290295
run: |
291296
set -e
292297
mkdir -p /tmp/vix-asio/include
@@ -295,14 +300,15 @@ jobs:
295300
296301
- name: Fetch sibling dependencies
297302
run: |
298-
rm -rf ../core ../utils ../async ../json ../template ../p2p
303+
rm -rf ../core ../utils ../async ../json ../template ../p2p ../crypto
299304
300305
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/core.git ../core
301306
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
302307
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
303308
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
304309
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
305310
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/p2p.git ../p2p
311+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/crypto.git ../crypto
306312
307313
git -C ../async submodule update --init --recursive --depth 1 || true
308314
@@ -316,10 +322,11 @@ jobs:
316322
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
317323
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
318324
test -f ../p2p/CMakeLists.txt || (echo "::error::../p2p/CMakeLists.txt is missing"; exit 1)
325+
test -f ../crypto/CMakeLists.txt || (echo "::error::../crypto/CMakeLists.txt is missing"; exit 1)
319326
320327
- name: Export dependency include paths
321328
run: |
322-
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include"
329+
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include:$GITHUB_WORKSPACE/../crypto/include"
323330
if [ -d "$GITHUB_WORKSPACE/../json/include" ]; then
324331
EXTRA_PATHS="$EXTRA_PATHS:$GITHUB_WORKSPACE/../json/include"
325332
fi
@@ -386,7 +393,7 @@ jobs:
386393
sudo apt-get install -y $DEPS
387394
test -f /usr/include/asio.hpp || (echo "::error::System Asio header not found after install"; exit 1)
388395
389-
- name: Prepare Asio layout for local async/core builds
396+
- name: Prepare Asio layout for local core builds
390397
run: |
391398
set -e
392399
mkdir -p /tmp/vix-asio/include
@@ -395,14 +402,15 @@ jobs:
395402
396403
- name: Fetch sibling dependencies
397404
run: |
398-
rm -rf ../core ../utils ../async ../json ../template ../p2p
405+
rm -rf ../core ../utils ../async ../json ../template ../p2p ../crypto
399406
400407
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/core.git ../core
401408
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
402409
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
403410
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
404411
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
405412
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/p2p.git ../p2p
413+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/crypto.git ../crypto
406414
407415
git -C ../async submodule update --init --recursive --depth 1 || true
408416
@@ -416,10 +424,11 @@ jobs:
416424
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
417425
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
418426
test -f ../p2p/CMakeLists.txt || (echo "::error::../p2p/CMakeLists.txt is missing"; exit 1)
427+
test -f ../crypto/CMakeLists.txt || (echo "::error::../crypto/CMakeLists.txt is missing"; exit 1)
419428
420429
- name: Export dependency include paths
421430
run: |
422-
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include"
431+
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include:$GITHUB_WORKSPACE/../crypto/include"
423432
if [ -d "$GITHUB_WORKSPACE/../json/include" ]; then
424433
EXTRA_PATHS="$EXTRA_PATHS:$GITHUB_WORKSPACE/../json/include"
425434
fi
@@ -480,7 +489,7 @@ jobs:
480489
sudo apt-get install -y $DEPS
481490
test -f /usr/include/asio.hpp || (echo "::error::System Asio header not found after install"; exit 1)
482491
483-
- name: Prepare Asio layout for local async/core builds
492+
- name: Prepare Asio layout for local core builds
484493
run: |
485494
set -e
486495
mkdir -p /tmp/vix-asio/include
@@ -489,14 +498,15 @@ jobs:
489498
490499
- name: Fetch sibling dependencies
491500
run: |
492-
rm -rf ../core ../utils ../async ../json ../template ../p2p
501+
rm -rf ../core ../utils ../async ../json ../template ../p2p ../crypto
493502
494503
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/core.git ../core
495504
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
496505
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
497506
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
498507
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
499508
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/p2p.git ../p2p
509+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/crypto.git ../crypto
500510
501511
git -C ../async submodule update --init --recursive --depth 1 || true
502512
@@ -510,10 +520,11 @@ jobs:
510520
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
511521
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
512522
test -f ../p2p/CMakeLists.txt || (echo "::error::../p2p/CMakeLists.txt is missing"; exit 1)
523+
test -f ../crypto/CMakeLists.txt || (echo "::error::../crypto/CMakeLists.txt is missing"; exit 1)
513524
514525
- name: Export dependency include paths
515526
run: |
516-
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include"
527+
EXTRA_PATHS="$GITHUB_WORKSPACE/../core/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include:$GITHUB_WORKSPACE/../p2p/include:$GITHUB_WORKSPACE/../crypto/include"
517528
if [ -d "$GITHUB_WORKSPACE/../json/include" ]; then
518529
EXTRA_PATHS="$EXTRA_PATHS:$GITHUB_WORKSPACE/../json/include"
519530
fi

0 commit comments

Comments
 (0)