Skip to content

Commit

Permalink
CI
Browse files Browse the repository at this point in the history
  • Loading branch information
bansan85 committed Dec 18, 2022
1 parent 1454cd1 commit 20b0f59
Show file tree
Hide file tree
Showing 8 changed files with 155 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: xargs -a config/apt-get.txt sudo apt-get install -yq
- name: Install gcc
if: contains(matrix.cc, 'gcc')
run: sudo apt-get install -yq g++-12 gcc-12 libdatetime-perl libdatetime-format-w3cdtf-perl
run: sudo apt-get install -yq g++-12 gcc-12 libdatetime-perl libdatetime-format-w3cdtf-perl libcapture-tiny-perl
- name: Install clang
if: contains(matrix.cc, 'clang')
run: sudo apt-get install -yq clang-14 llvm-14 tidy
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
run: sudo apt-get install -yq sshpass
- name: Install emscripten
run: |
git clone --depth=1 https://github.com/emscripten-core/emsdk.git
git clone --depth=1 https://github.com/bansan85/emsdk.git
cd emsdk
./emsdk install latest
./emsdk activate latest
Expand All @@ -66,7 +66,6 @@ jobs:
- name: cmake
run: |
source ./emsdk/emsdk_env.sh
echo "EMSDK_NODE=/opt/hostedtoolcache/node/18.12.0/x64/bin/node" >> $GITHUB_ENV
npm install -g npm
mkdir build
emcmake cmake -S . -B build -DCMAKE_BUILD_TYPE=${{ matrix.config }} -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${{ env.EMSDK }}/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DVCPKG_TARGET_TRIPLET=wasm32-emscripten -DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_PREFIX_PATH=${{ github.workspace }}/vcpkg/installed/wasm32-emscripten/share/spdlog
Expand All @@ -92,16 +91,18 @@ jobs:
if: failure()
with:
name: cypress-screenshots
path: src/angular/cypress/screenshots
path: |
src/angular/cypress/screenshots
src/angular/projects/app-main/dist
- uses: actions/upload-artifact@v3
if: always()
with:
name: cypress-videos
path: src/angular/cypress/videos
#- name: pa11y
# run: |
# cd src/angular || exit 1
# npx pa11y http://localhost:4200
- name: pa11y
run: |
cd src/angular || exit 1
npx pa11y http://localhost:4200
- name: Lighthouse
run: |
cd src/angular || exit 1
Expand Down
1 change: 1 addition & 0 deletions .iwyu-suppressions
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[
{ include: ["@<bits/chrono.h>", "private", "<chrono>", "public"] },
{ include: ["@<bits/exception.h>", "private", "<exception>", "public"] },
{ include: ["@<cereal/archives/json.hpp>", "private", "<jessica/helper/clean/cereal/json.h>", "public"] },
{ include: ["@<cereal/cereal.hpp>", "private", "<jessica/helper/clean/cereal/cereal.h>", "public"] },
Expand Down
7 changes: 4 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.15)
cmake_minimum_required(VERSION 3.21)

project(Jessica VERSION 0.0.1)

Expand Down Expand Up @@ -89,7 +89,7 @@ if(NOT EMSCRIPTEN)
FetchContent_Declare(
drogon
GIT_REPOSITORY https://github.com/drogonframework/drogon.git
GIT_TAG cf543716ce33fce395bac3e34fc8aa4c81353783)
GIT_TAG v1.8.2)

FetchContent_MakeAvailable(drogon)

Expand Down Expand Up @@ -228,7 +228,8 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
/wd5039
/wd5045
/EHsc
/showIncludes)
/showIncludes
/Wv:18)
else()
message(WARNING "${CMAKE_CXX_COMPILER_ID} is unknown")
endif()
Expand Down
134 changes: 108 additions & 26 deletions src/angular/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion test/backend/calc/geotechnical/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,14 @@ target_link_libraries(
PRIVATE GTest::GTest GTest::Main nlohmann_json::nlohmann_json
simdjson::simdjson spdlog::spdlog_header_only jessica)

add_test(NAME TestCalcMeyerhof COMMAND test_calc_meyerhof)
foreach(TESTI test_calc_meyerhof)
add_test(NAME ${TESTI} COMMAND ${TESTI})
if($<TARGET_RUNTIME_DLLS:${TESTI}>)
add_custom_command(
TARGET ${TESTI}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_RUNTIME_DLLS:${TESTI}> $<TARGET_FILE_DIR:${TESTI}>
COMMAND_EXPAND_LISTS)
endif()
endforeach()
14 changes: 11 additions & 3 deletions test/backend/data/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ target_link_libraries(
PRIVATE GTest::GTest GTest::Main nlohmann_json::nlohmann_json
simdjson::simdjson spdlog::spdlog_header_only jessica)

add_test(NAME TestGeotechnicalFoundationStrip
COMMAND test_geotechnical_foundation_strip)
add_test(NAME TestLoadVerticalEccentric COMMAND test_load_vertical_eccentric)
foreach(TESTI test_geotechnical_foundation_strip test_load_vertical_eccentric)
add_test(NAME ${TESTI} COMMAND ${TESTI})
if($<TARGET_RUNTIME_DLLS:${TESTI}>)
add_custom_command(
TARGET ${TESTI}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_RUNTIME_DLLS:${TESTI}> $<TARGET_FILE_DIR:${TESTI}>
COMMAND_EXPAND_LISTS)
endif()
endforeach()
12 changes: 11 additions & 1 deletion test/backend/util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,14 @@ target_link_libraries(
PRIVATE GTest::GTest GTest::Main nlohmann_json::nlohmann_json
simdjson::simdjson jessica)

add_test(NAME TestUtilDecorator COMMAND test_util_decorator)
foreach(TESTI test_util_decorator)
add_test(NAME ${TESTI} COMMAND ${TESTI})
if($<TARGET_RUNTIME_DLLS:${TESTI}>)
add_custom_command(
TARGET ${TESTI}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
$<TARGET_RUNTIME_DLLS:${TESTI}> $<TARGET_FILE_DIR:${TESTI}>
COMMAND_EXPAND_LISTS)
endif()
endforeach()

0 comments on commit 20b0f59

Please sign in to comment.