From 987066097cd5f7769fcddb894672a89b7f70842d Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Fri, 10 Feb 2023 18:17:18 -0500 Subject: [PATCH 1/5] hard code switch to debug builds --- .github/actions/build-asset-unix.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 9c32a0af..4aa8888c 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -42,10 +42,7 @@ if [[ compile_cuda ]]; then exe_name=bladebit_cuda fi -mkdir build && cd build -cmake .. -bash -eo pipefail ../embed-version.sh -cmake --build . --target bladebit --config Release --target $target -j $thread_count +mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug && cmake --buid . --config Debug --target bladebit_cuda -j$(nproc --all) chmod +x ./bladebit if [[ $OSTYPE == 'msys'* ]] || [[ $OSTYPE == 'cygwin'* ]]; then From 7d5458bb1d33bbe5d2726500f784417d1294186e Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Fri, 10 Feb 2023 18:24:08 -0500 Subject: [PATCH 2/5] also -G --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9dc4a294..34ded711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -515,7 +515,7 @@ target_compile_options(lib_bladebit_cuda PRIVATE >) # target_compile_options(lib_bladebit_cuda PRIVATE "$<${is_cuda_debug}:-Xcompiler=${cuda_debug_c_opts}">) -# target_compile_options(lib_bladebit_cuda PRIVATE "$<${is_cuda_debug}:-G">) +target_compile_options(lib_bladebit_cuda PRIVATE "$<${is_cuda_debug}:-G">) # target_compile_options(lib_bladebit_cuda PRIVATE $<${is_cuda}:-Xcompiler=/FIpch.h>) # target_compile_options(lib_bladebit_cuda PRIVATE $<$:${c_opts} ${release_c_opts}>) @@ -543,4 +543,4 @@ set_target_properties(lib_bladebit_cuda bladebit_cuda PROPERTIES source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR}/src FILES ${src_full} ${bb_headers} ) -endif() # CUDAToolkit_FOUND \ No newline at end of file +endif() # CUDAToolkit_FOUND From fe2cd62a380bd36c2ca26d9bfa6ce88b4924288e Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Fri, 10 Feb 2023 18:27:56 -0500 Subject: [PATCH 3/5] oops --- .github/actions/build-asset-unix.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index 4aa8888c..f5ca23e8 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -42,7 +42,10 @@ if [[ compile_cuda ]]; then exe_name=bladebit_cuda fi -mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug && cmake --buid . --config Debug --target bladebit_cuda -j$(nproc --all) +mkdir build && cd build +cmake .. -DCMAKE_BUILD_TYPE=Debug +bash -eo pipefail ../embed-version.sh +cmake --build . --target bladebit --config Debug --target $target -j $thread_count chmod +x ./bladebit if [[ $OSTYPE == 'msys'* ]] || [[ $OSTYPE == 'cygwin'* ]]; then From 8aa795f163021377959bb23c3ff7e77bcc306b87 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Fri, 10 Feb 2023 18:28:40 -0500 Subject: [PATCH 4/5] Update CMakeLists.txt From 62af65914fa4e05eb989f15ed82322f83722efad Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Fri, 10 Feb 2023 21:23:02 -0500 Subject: [PATCH 5/5] ignore version check for now --- .github/actions/build-asset-unix.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/actions/build-asset-unix.sh b/.github/actions/build-asset-unix.sh index f5ca23e8..3408b65d 100755 --- a/.github/actions/build-asset-unix.sh +++ b/.github/actions/build-asset-unix.sh @@ -57,14 +57,13 @@ fi # Ensure bladebit version matches expected version bb_version="$(./${exe_name} --version | xargs)" -if [[ "$bb_version" != "$version" ]]; then - >&2 echo "Incorrect bladebit version. Got '$bb_version' but expected '$version'." - exit 1 -fi +#if [[ "$bb_version" != "$version" ]]; then +# >&2 echo "Incorrect bladebit version. Got '$bb_version' but expected '$version'." +# exit 1 +#fi tar --version tar -czvf $artifact_name $exe_name mkdir ../bin mv $artifact_name ../bin/ ls -la ../bin -