CI master

cropinghigh · May 11, 2024 · 7f4bdfa · 7f4bdfa
1 parent f20da73
commit 7f4bdfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -11,8 +11,8 @@ jobs:
         steps:
         - 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'
+        - name: Get SDR++ master source
+          run: 'wget https://github.com/AlexandreRouma/SDRPlusPlus/archive/refs/heads/master.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 master.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: Install dependencies
           run: 'sudo apt-get update && sudo apt-get install libfftw3-dev libglfw3-dev libvolk2-dev libzstd-dev libnng-dev'
         - name: Cmake
-          run: 'mkdir build && cd build && ls -lah .. && cmake .. -DSDRPP_CORE_ROOT="$GITHUB_WORKSPACE/sdrpp_lib/SDRPlusPlus-nightly/core" -DSDRPP_LIB_ROOT="$GITHUB_WORKSPACE/sdrpp_lib/usr/lib" -DSDRPP_MODULE_CMAKE="$GITHUB_WORKSPACE/sdrpp_module_hack.cmake"'
+          run: 'mkdir build && cd build && ls -lah .. && cmake .. -DSDRPP_CORE_ROOT="$GITHUB_WORKSPACE/sdrpp_lib/SDRPlusPlus-master/core" -DSDRPP_LIB_ROOT="$GITHUB_WORKSPACE/sdrpp_lib/usr/lib" -DSDRPP_MODULE_CMAKE="$GITHUB_WORKSPACE/sdrpp_module_hack.cmake"'
         - name: Make
           run: 'cd build && make -j4 && ldd dvbs_demodulator.so'
         - name: Upload library

diff --git a/.github/workflows/sdrpp_module_hack.cmake b/.github/workflows/sdrpp_module_hack.cmake
@@ -1,6 +1,6 @@
 # Get needed values depending on if this is in-tree or out-of-tree
 if (NOT SDRPP_CORE_ROOT)
-    set(SDRPP_CORE_ROOT "../sdrpp_lib/SDRPlusPlus-nightly/core/src")
+    set(SDRPP_CORE_ROOT "../sdrpp_lib/SDRPlusPlus-master/core/src")
 endif ()
 if (NOT SDRPP_LIB_ROOT)
     set(SDRPP_LIB_ROOT "/usr/lib")