From 0dd447388c1d10b52045001d09d0339e311dad03 Mon Sep 17 00:00:00 2001 From: cropinghigh indir Date: Wed, 8 May 2024 16:49:32 +0300 Subject: [PATCH] CI debug 2 --- .github/workflows/build_all.yml | 8 ++++---- .github/workflows/sdrpp_module_hack.cmake | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 7f68d3d..7a22fff 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -12,7 +12,7 @@ jobs: - name: Repo checkout uses: actions/checkout@v4 - name: Get SDR++ nightly source - run: wget https://github.com/AlexandreRouma/SDRPlusPlus/archive/refs/tags/nightly.tar.gz && pwd && ls -lah + run: 'wget https://github.com/AlexandreRouma/SDRPlusPlus/archive/refs/tags/nightly.tar.gz && pwd && ls -lah' - name: Get SDR++ nightly lib uses: dsaltares/fetch-gh-release-asset@master with: @@ -21,11 +21,11 @@ jobs: file: 'sdrpp_debian_sid_amd64.deb' token: ${{ secrets.GITHUB_TOKEN }} - name: Unpack SDR++ source and core lib - run: mkdir sdrpp_lib && tar -zxvf nightly.tar.gz -C sdrpp_lib && dpkg-deb -xv sdrpp_debian_sid_amd64.deb ./sdrpp_lib && cp ./.github/workflows/sdrpp_module_hack.cmake ./ && pwd && ls -lah && ls -lah sdrpp_lib + run: 'mkdir sdrpp_lib && tar -zxvf nightly.tar.gz -C sdrpp_lib && dpkg-deb -xv sdrpp_debian_sid_amd64.deb ./sdrpp_lib && cp ./.github/workflows/sdrpp_module_hack.cmake ./ && pwd && ls -lah && ls -lah sdrpp_lib' - name: Cmake - run: mkdir build && cd build && ls -lah .. && cmake .. -DSDRPP_MODULE_CMAKE="../sdrpp_module_hack.cmake" + run: 'mkdir build && cd build && ls -lah .. && cmake .. -DSDRPP_MODULE_CMAKE="$Env:GITHUB_WORKSPACE/sdrpp_module_hack.cmake"' - name: Make - run: make -j4 + run: 'make -j4' - name: Upload library uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/sdrpp_module_hack.cmake b/.github/workflows/sdrpp_module_hack.cmake index 01115e5..dce2122 100644 --- a/.github/workflows/sdrpp_module_hack.cmake +++ b/.github/workflows/sdrpp_module_hack.cmake @@ -27,7 +27,7 @@ endif () # Created shared lib and link to core add_library(${PROJECT_NAME} SHARED ${SRC}) -target_link_libraries(${PROJECT_NAME} PRIVATE ../sdrpp_lib/sdrpp_core/lib/libsdrpp_core.so) +target_link_libraries(${PROJECT_NAME} PRIVATE ../sdrpp_lib/sdrpp_core/usr/lib/libsdrpp_core.so) target_include_directories(${PROJECT_NAME} PRIVATE "${SDRPP_CORE_ROOT}/src/" "${SDRPP_CORE_ROOT}/src/imgui/") set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")