diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 949b418f..f5013e68 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - name: Install Dependencies shell: bash - run: sudo apt install -y libcunit1-dev libncurses5-dev libssl-dev libjansson-dev libcmocka-dev libpcap-dev + run: sudo apt install -y libcunit1-dev libncurses-dev libssl-dev libjansson-dev libcmocka-dev libpcap-dev - name: Set export SOURCE_DATE_EPOCH to git commit time run: | @@ -41,7 +41,7 @@ jobs: - name: Configure CMake shell: bash working-directory: ${{github.workspace}}/build - run: cmake $GITHUB_WORKSPACE -DGIT_REF=$GITHUB_REF -DGIT_SHA=$GITHUB_SHA -DBNGBLASTER_TESTS=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE + run: cmake $GITHUB_WORKSPACE -DGIT_REF=$GITHUB_REF -DGIT_SHA=$GITHUB_SHA -DBNGBLASTER_TESTS=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBNGBLASTER_OS=${{matrix.os}} - name: Build working-directory: ${{github.workspace}}/build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 590ab302..dd624a48 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Create Release id: create_release - uses: actions/create-release@v1 + uses: actions/create-release@v1.1.4 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: @@ -59,7 +59,7 @@ jobs: - name: Install Dependencies shell: bash - run: sudo apt install -y libcunit1-dev libncurses5-dev libssl-dev libjansson-dev libcmocka-dev libpcap-dev + run: sudo apt install -y libcunit1-dev libncurses-dev libssl-dev libjansson-dev libcmocka-dev libpcap-dev - name: Set export SOURCE_DATE_EPOCH to git commit time run: | @@ -71,7 +71,7 @@ jobs: - name: Configure CMake shell: bash working-directory: ${{ github.workspace }}/build - run: cmake $GITHUB_WORKSPACE -DBNGBLASTER_VERSION=${{ steps.ref_name.outputs.SOURCE_TAG }} -DBNGBLASTER_TESTS=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE + run: cmake $GITHUB_WORKSPACE -DBNGBLASTER_VERSION=${{ steps.ref_name.outputs.SOURCE_TAG }} -DBNGBLASTER_TESTS=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBNGBLASTER_OS=${{matrix.os}} - name: Build working-directory: ${{ github.workspace }}/build @@ -90,7 +90,7 @@ jobs: - name: Get Release id: get_release - uses: leahlundqvist/get-release@v1.3.1 + uses: bruceadams/get-release@v1.3.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/CMakeLists.txt b/CMakeLists.txt index b7c9e34e..26a2de1f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,8 +44,17 @@ if(BNGBLASTER_TESTS) endif() add_subdirectory(code) +# cpack set(CPACK_GENERATOR "DEB") -set(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl1.1, libncurses5, libjansson4") + +if (BNGBLASTER_OS STREQUAL "ubuntu-18.04") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl1.1, libncurses5, libjansson4") +elseif (BNGBLASTER_OS STREQUAL "ubuntu-20.04") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl1.1, libncurses5, libjansson4") +else() + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl3, libncurses6, libjansson4") +endif() + set(CPACK_DEBIAN_LIB_PACKAGE_NAME "bngblaster") set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "RtBrick BNG Blaster")