Skip to content

Commit 1de9c29

Browse files
GaspardKiriraGaspardKirira
committed
ci(core): fix standalone CI dependency includes for async and json
1 parent 71dd7f9 commit 1de9c29

1 file changed

Lines changed: 43 additions & 32 deletions

File tree

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

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,11 @@ jobs:
8383
8484
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
8585
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
86-
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
86+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json
8787
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
8888
8989
git -C ../async submodule update --init --recursive --depth 1 || true
9090
91-
echo "---- repository root ----"
92-
pwd
9391
echo "---- sibling dependencies ----"
9492
ls -la ../utils || true
9593
ls -la ../async || true
@@ -103,6 +101,8 @@ jobs:
103101
run: |
104102
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
105103
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
104+
test -f ../json/CMakeLists.txt || (echo "::error::../json/CMakeLists.txt is missing"; exit 1)
105+
106106
if [ -f ../async/third_party/asio/include/asio.hpp ]; then
107107
echo "Vendored Asio found in async."
108108
elif [ -f /usr/include/asio.hpp ]; then
@@ -111,7 +111,18 @@ jobs:
111111
echo "::error::Neither vendored Asio nor system Asio was found."
112112
exit 1
113113
fi
114-
echo "Required sibling dependencies are present."
114+
115+
if [ -f ../json/include/vix/json/Simple.hpp ]; then
116+
echo "JSON headers found."
117+
else
118+
echo "::error::../json/include/vix/json/Simple.hpp is missing."
119+
exit 1
120+
fi
121+
122+
- name: Export dependency include paths
123+
run: |
124+
echo "CPATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPATH:+:$CPATH}" >> "$GITHUB_ENV"
125+
echo "CPLUS_INCLUDE_PATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPLUS_INCLUDE_PATH:+:$CPLUS_INCLUDE_PATH}" >> "$GITHUB_ENV"
115126
116127
- name: Select compiler
117128
run: |
@@ -178,7 +189,7 @@ jobs:
178189
179190
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
180191
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
181-
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
192+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json
182193
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
183194
184195
git -C ../async submodule update --init --recursive --depth 1 || true
@@ -187,12 +198,12 @@ jobs:
187198
run: |
188199
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
189200
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
190-
if [ -f ../async/third_party/asio/include/asio.hpp ] || [ -f /usr/include/asio.hpp ]; then
191-
echo "Asio is available."
192-
else
193-
echo "::error::Asio is not available for async."
194-
exit 1
195-
fi
201+
test -f ../json/include/vix/json/Simple.hpp || (echo "::error::JSON headers are missing"; exit 1)
202+
203+
- name: Export dependency include paths
204+
run: |
205+
echo "CPATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPATH:+:$CPATH}" >> "$GITHUB_ENV"
206+
echo "CPLUS_INCLUDE_PATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPLUS_INCLUDE_PATH:+:$CPLUS_INCLUDE_PATH}" >> "$GITHUB_ENV"
196207
197208
- name: Configure runtime build
198209
run: |
@@ -334,7 +345,7 @@ jobs:
334345
335346
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
336347
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
337-
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
348+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json
338349
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
339350
340351
git -C ../async submodule update --init --recursive --depth 1 || true
@@ -343,12 +354,12 @@ jobs:
343354
run: |
344355
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
345356
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
346-
if [ -f ../async/third_party/asio/include/asio.hpp ] || [ -f /usr/include/asio.hpp ]; then
347-
echo "Asio is available."
348-
else
349-
echo "::error::Asio is not available for async."
350-
exit 1
351-
fi
357+
test -f ../json/include/vix/json/Simple.hpp || (echo "::error::JSON headers are missing"; exit 1)
358+
359+
- name: Export dependency include paths
360+
run: |
361+
echo "CPATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPATH:+:$CPATH}" >> "$GITHUB_ENV"
362+
echo "CPLUS_INCLUDE_PATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPLUS_INCLUDE_PATH:+:$CPLUS_INCLUDE_PATH}" >> "$GITHUB_ENV"
352363
353364
- name: Configure for analysis
354365
run: |
@@ -415,7 +426,7 @@ jobs:
415426
416427
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
417428
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
418-
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
429+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json
419430
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
420431
421432
git -C ../async submodule update --init --recursive --depth 1 || true
@@ -424,12 +435,12 @@ jobs:
424435
run: |
425436
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
426437
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
427-
if [ -f ../async/third_party/asio/include/asio.hpp ] || [ -f /usr/include/asio.hpp ]; then
428-
echo "Asio is available."
429-
else
430-
echo "::error::Asio is not available for async."
431-
exit 1
432-
fi
438+
test -f ../json/include/vix/json/Simple.hpp || (echo "::error::JSON headers are missing"; exit 1)
439+
440+
- name: Export dependency include paths
441+
run: |
442+
echo "CPATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPATH:+:$CPATH}" >> "$GITHUB_ENV"
443+
echo "CPLUS_INCLUDE_PATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPLUS_INCLUDE_PATH:+:$CPLUS_INCLUDE_PATH}" >> "$GITHUB_ENV"
433444
434445
- name: Configure valgrind build
435446
run: |
@@ -505,7 +516,7 @@ jobs:
505516
506517
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/utils.git ../utils
507518
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" --recurse-submodules https://github.com/vixcpp/async.git ../async
508-
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json || true
519+
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/json.git ../json
509520
git clone --depth 1 --branch "${VIX_GIT_BRANCH}" https://github.com/vixcpp/template.git ../template || true
510521
511522
git -C ../async submodule update --init --recursive --depth 1 || true
@@ -514,12 +525,12 @@ jobs:
514525
run: |
515526
test -f ../utils/CMakeLists.txt || (echo "::error::../utils/CMakeLists.txt is missing"; exit 1)
516527
test -f ../async/CMakeLists.txt || (echo "::error::../async/CMakeLists.txt is missing"; exit 1)
517-
if [ -f ../async/third_party/asio/include/asio.hpp ] || [ -f /usr/include/asio.hpp ]; then
518-
echo "Asio is available."
519-
else
520-
echo "::error::Asio is not available for async."
521-
exit 1
522-
fi
528+
test -f ../json/include/vix/json/Simple.hpp || (echo "::error::JSON headers are missing"; exit 1)
529+
530+
- name: Export dependency include paths
531+
run: |
532+
echo "CPATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPATH:+:$CPATH}" >> "$GITHUB_ENV"
533+
echo "CPLUS_INCLUDE_PATH=$GITHUB_WORKSPACE/../json/include:$GITHUB_WORKSPACE/../template/include:$GITHUB_WORKSPACE/../utils/include:$GITHUB_WORKSPACE/../async/include${CPLUS_INCLUDE_PATH:+:$CPLUS_INCLUDE_PATH}" >> "$GITHUB_ENV"
523534
524535
- name: Configure release mode
525536
run: |

0 commit comments

Comments
 (0)