From 95705752de5cbb7ba63abc6ab2a62cf8800556ee Mon Sep 17 00:00:00 2001 From: safinsaf Date: Tue, 19 Jul 2022 15:54:26 +0300 Subject: [PATCH 01/11] Add windows build Signed-off-by: safinsaf --- .github/workflows/ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9efc498..1416af9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,23 @@ env: ~/.hunter jobs: + Windows_MSVC: + runs-on: windows-2019 + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: ${{ env.CACHE_PATHS }} + key: ${{ github.job }}-${{ env.CACHE_VERSION }} + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1.1 + with: + vs-version: "16.11" + + - name: build msvc 2019 16 + run: bash ./scripts/build.sh + MacOS: runs-on: macos-latest steps: From da8861f4f40fc3e213ed23c2bc627619981c28e8 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Tue, 19 Jul 2022 16:08:07 +0300 Subject: [PATCH 02/11] Debug j3 error Signed-off-by: safinsaf --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 0101bd2..d52bef6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -4,7 +4,7 @@ BUILD_DIR="${BUILD_DIR:?BUILD_DIR variable is not defined}" BUILD_TARGET="${BUILD_TARGET:-test}" JOBS_NUM="$(( $(nproc 2>/dev/null || sysctl -n hw.ncpu) + 1 ))" -MAKE_ARGS="${MAKE_ARGS:-"-j$JOBS_NUM"}" +MAKE_ARGS="${MAKE_ARGS:-"-j $JOBS_NUM"}" cd "$(dirname "$0")/.." From 2523d440b8220f105fedb307eee4dfd75bb9f533 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Tue, 19 Jul 2022 16:23:46 +0300 Subject: [PATCH 03/11] Separate build files Signed-off-by: safinsaf --- .github/workflows/ci.yml | 4 ++-- scripts/build.sh | 2 +- scripts/build_win.sh | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 scripts/build_win.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1416af9..b06148f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,8 +32,8 @@ jobs: vs-version: "16.11" - name: build msvc 2019 16 - run: bash ./scripts/build.sh - + run: bash ./scripts/build_win.sh + MacOS: runs-on: macos-latest steps: diff --git a/scripts/build.sh b/scripts/build.sh index d52bef6..0101bd2 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -4,7 +4,7 @@ BUILD_DIR="${BUILD_DIR:?BUILD_DIR variable is not defined}" BUILD_TARGET="${BUILD_TARGET:-test}" JOBS_NUM="$(( $(nproc 2>/dev/null || sysctl -n hw.ncpu) + 1 ))" -MAKE_ARGS="${MAKE_ARGS:-"-j $JOBS_NUM"}" +MAKE_ARGS="${MAKE_ARGS:-"-j$JOBS_NUM"}" cd "$(dirname "$0")/.." diff --git a/scripts/build_win.sh b/scripts/build_win.sh new file mode 100644 index 0000000..04cc29d --- /dev/null +++ b/scripts/build_win.sh @@ -0,0 +1,23 @@ +#!/bin/bash -xe + +BUILD_DIR="${BUILD_DIR:?BUILD_DIR variable is not defined}" +BUILD_TARGET="${BUILD_TARGET:-test}" + +cd "$(dirname "$0")/.." + +git submodule update --init + +CMAKE_ARGS=( "-B" "${BUILD_DIR}" "$@" ) + +# see clang-tidy build in ci.yml github workflow +if [ "${BUILD_TARGET}" == "test" ]; then + CMAKE_ARGS+=( "-DBUILD_TESTS=ON" ) +fi + +cmake . "${CMAKE_ARGS[@]}" + +if [ "${BUILD_TARGET}" == "test" ]; then + # first build test executables + cmake --build "${BUILD_DIR}" -- "${MAKE_ARGS}" +fi +cmake --build "${BUILD_DIR}" --target "${BUILD_TARGET}" -- "${MAKE_ARGS}" From 675db092253659e16032d66949855d6b634d04f7 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Thu, 21 Jul 2022 15:26:44 +0300 Subject: [PATCH 04/11] Change script Signed-off-by: safinsaf --- scripts/build_win.sh | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/scripts/build_win.sh b/scripts/build_win.sh index 04cc29d..cb68941 100644 --- a/scripts/build_win.sh +++ b/scripts/build_win.sh @@ -1,23 +1,6 @@ #!/bin/bash -xe -BUILD_DIR="${BUILD_DIR:?BUILD_DIR variable is not defined}" -BUILD_TARGET="${BUILD_TARGET:-test}" - -cd "$(dirname "$0")/.." - -git submodule update --init - -CMAKE_ARGS=( "-B" "${BUILD_DIR}" "$@" ) - -# see clang-tidy build in ci.yml github workflow -if [ "${BUILD_TARGET}" == "test" ]; then - CMAKE_ARGS+=( "-DBUILD_TESTS=ON" ) -fi - -cmake . "${CMAKE_ARGS[@]}" - -if [ "${BUILD_TARGET}" == "test" ]; then - # first build test executables - cmake --build "${BUILD_DIR}" -- "${MAKE_ARGS}" -fi -cmake --build "${BUILD_DIR}" --target "${BUILD_TARGET}" -- "${MAKE_ARGS}" +mkdir build && cd build +cmake .. +cmake --build . +ctest -C Debug \ No newline at end of file From ca8004eb1096057c8f7e3a80777957d4ec1fe310 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 27 Jul 2022 16:05:19 +0300 Subject: [PATCH 05/11] Add Ramils commits Signed-off-by: safinsaf --- CMakeLists.txt | 9 ++++--- cmake/HunterGate.cmake | 3 ++- test/CMakeLists.txt | 54 +----------------------------------------- 3 files changed, 7 insertions(+), 59 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e411dee..fec59c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,10 +30,9 @@ find_package(Microsoft.GSL CONFIG REQUIRED) add_subdirectory(src) -if (BUILD_TESTS) - enable_testing() - add_subdirectory(test ${CMAKE_BINARY_DIR}/tests_bin) -endif () + +enable_testing() +add_subdirectory(test ${CMAKE_BINARY_DIR}/tests_bin) ############################################################################### # INSTALLATION @@ -71,4 +70,4 @@ install( EXPORT scaleConfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/scale NAMESPACE scale:: -) +) \ No newline at end of file diff --git a/cmake/HunterGate.cmake b/cmake/HunterGate.cmake index bd00e6a..51f3d3d 100644 --- a/cmake/HunterGate.cmake +++ b/cmake/HunterGate.cmake @@ -41,6 +41,7 @@ # Projects: # * https://github.com/hunter-packages/gate/ # * https://github.com/ruslo/hunter +set(CXXFLAGS="-Wno-error=deprecated-copy" cmake CMakeLists.txt) option(HUNTER_ENABLED "Enable Hunter package manager support" ON) @@ -536,4 +537,4 @@ macro(HunterGate) include("${_master_location}") set_property(GLOBAL PROPERTY HUNTER_GATE_DONE YES) endif() -endmacro() +endmacro() \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8b6fba1..b4f8e6d 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -53,44 +53,6 @@ target_link_libraries(scale_decoder_stream_test scale ) -addtest(scale_encode_append_test - scale_encode_append_test.cpp - ) -target_link_libraries(scale_encode_append_test - scale_encode_append - ) - -addtest(scale_compact_test - scale_compact_test.cpp - ) -target_link_libraries(scale_compact_test - scale - buffer - ) - -addtest(scale_enum_test - scale_enum_test.cpp - ) -target_link_libraries(scale_enum_test - scale - buffer - ) - -addtest(scale_fixed_test - scale_fixed_test.cpp - ) -target_link_libraries(scale_fixed_test - scale - buffer - ) - -addtest(scale_boolean_test - scale_boolean_test.cpp - ) -target_link_libraries(scale_boolean_test - scale - buffer - ) addtest(scale_optional_test scale_optional_test.cpp @@ -108,13 +70,6 @@ target_link_libraries(scale_collection_test buffer ) -addtest(scale_variant_test - scale_variant_test.cpp - ) -target_link_libraries(scale_variant_test - scale - buffer - ) addtest(scale_pair_test scale_pair_test.cpp @@ -150,11 +105,4 @@ addtest(scale_array_test ) target_link_libraries(scale_array_test scale - ) - -addtest(scale_encode_counter_test - scale_encode_counter_test.cpp - ) -target_link_libraries(scale_encode_counter_test - scale - ) + ) \ No newline at end of file From 29be3d859f56e12df5faa57fff5854520bdfeee7 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 27 Jul 2022 16:22:14 +0300 Subject: [PATCH 06/11] Add test1 Signed-off-by: safinsaf --- test/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b4f8e6d..5faf38b 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -105,4 +105,13 @@ addtest(scale_array_test ) target_link_libraries(scale_array_test scale + ) + + + +addtest(scale_encode_append_test + scale_encode_append_test.cpp + ) +target_link_libraries(scale_encode_append_test + scale_encode_append ) \ No newline at end of file From 531c4b143d1f9b88cc7c69b89d22efb74183ba4b Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 27 Jul 2022 16:33:54 +0300 Subject: [PATCH 07/11] Add test1 Signed-off-by: safinsaf --- .github/workflows/ci.yml | 2 ++ test/CMakeLists.txt | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b06148f..4a96c90 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,8 +32,10 @@ jobs: vs-version: "16.11" - name: build msvc 2019 16 + continue-on-error: true run: bash ./scripts/build_win.sh + MacOS: runs-on: macos-latest steps: diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5faf38b..cf7cd03 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -114,4 +114,36 @@ addtest(scale_encode_append_test ) target_link_libraries(scale_encode_append_test scale_encode_append + ) + +addtest(scale_compact_test + scale_compact_test.cpp + ) +target_link_libraries(scale_compact_test + scale + buffer + ) + +addtest(scale_enum_test + scale_enum_test.cpp + ) +target_link_libraries(scale_enum_test + scale + buffer + ) + +addtest(scale_fixed_test + scale_fixed_test.cpp + ) +target_link_libraries(scale_fixed_test + scale + buffer + ) + +addtest(scale_boolean_test + scale_boolean_test.cpp + ) +target_link_libraries(scale_boolean_test + scale + buffer ) \ No newline at end of file From 052a544b6b1d483f1e04e44aab1157d4ce5717a8 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 27 Jul 2022 17:03:12 +0300 Subject: [PATCH 08/11] Add all tests Signed-off-by: safinsaf --- test/CMakeLists.txt | 85 +++++++++++++++++++++++++-------------------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index cf7cd03..ee61674 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -53,6 +53,44 @@ target_link_libraries(scale_decoder_stream_test scale ) +addtest(scale_encode_append_test + scale_encode_append_test.cpp + ) +target_link_libraries(scale_encode_append_test + scale_encode_append + ) + +addtest(scale_compact_test + scale_compact_test.cpp + ) +target_link_libraries(scale_compact_test + scale + buffer + ) + +addtest(scale_enum_test + scale_enum_test.cpp + ) +target_link_libraries(scale_enum_test + scale + buffer + ) + +addtest(scale_fixed_test + scale_fixed_test.cpp + ) +target_link_libraries(scale_fixed_test + scale + buffer + ) + +addtest(scale_boolean_test + scale_boolean_test.cpp + ) +target_link_libraries(scale_boolean_test + scale + buffer + ) addtest(scale_optional_test scale_optional_test.cpp @@ -70,6 +108,13 @@ target_link_libraries(scale_collection_test buffer ) +addtest(scale_variant_test + scale_variant_test.cpp + ) +target_link_libraries(scale_variant_test + scale + buffer + ) addtest(scale_pair_test scale_pair_test.cpp @@ -107,43 +152,9 @@ target_link_libraries(scale_array_test scale ) - - -addtest(scale_encode_append_test - scale_encode_append_test.cpp - ) -target_link_libraries(scale_encode_append_test - scale_encode_append - ) - -addtest(scale_compact_test - scale_compact_test.cpp +addtest(scale_encode_counter_test + scale_encode_counter_test.cpp ) -target_link_libraries(scale_compact_test +target_link_libraries(scale_encode_counter_test scale - buffer - ) - -addtest(scale_enum_test - scale_enum_test.cpp - ) -target_link_libraries(scale_enum_test - scale - buffer - ) - -addtest(scale_fixed_test - scale_fixed_test.cpp - ) -target_link_libraries(scale_fixed_test - scale - buffer - ) - -addtest(scale_boolean_test - scale_boolean_test.cpp - ) -target_link_libraries(scale_boolean_test - scale - buffer ) \ No newline at end of file From 131cc5629bebb77f5a010b3f7cb08dd6b6d48995 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 27 Jul 2022 17:20:39 +0300 Subject: [PATCH 09/11] List all files Signed-off-by: safinsaf --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a96c90..0e653da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,10 @@ jobs: continue-on-error: true run: bash ./scripts/build_win.sh + - name: show tests dir + run: | + dir \D:\a\scale-codec-cpp\scale-codec-cpp\build\tests_bin\Debug\ + MacOS: runs-on: macos-latest From 2227d394da52490b601b408e6e0fa4d7e5b6dd99 Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 27 Jul 2022 17:27:34 +0300 Subject: [PATCH 10/11] Show current dir Signed-off-by: safinsaf --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e653da..9836c5e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: show tests dir run: | - dir \D:\a\scale-codec-cpp\scale-codec-cpp\build\tests_bin\Debug\ + dir . MacOS: From 6578ca3afcb31583da01f7312c16ea841df10c7f Mon Sep 17 00:00:00 2001 From: safinsaf Date: Wed, 27 Jul 2022 18:08:15 +0300 Subject: [PATCH 11/11] Show tests dir Signed-off-by: safinsaf --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9836c5e..ad9220e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,7 +37,7 @@ jobs: - name: show tests dir run: | - dir . + dir .\build\tests_bin\Debug MacOS: