diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml deleted file mode 100644 index 451548c..0000000 --- a/.github/workflows/integration_test.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Integration Tests -'on': - workflow_dispatch: - inputs: - extra_resolve_options: - description: Extra Resolve Options - required: false - schedule: - - cron: 0 1 * * * - push: - branches: - - master - pull_request: -jobs: - integration_tests: - timeout-minutes: 45 - strategy: - fail-fast: false - runs-on: - - self-hosted - - docker - - builder - name: Integration Tests - container: - image: ghcr.io/steinwurf/python-bindings:latest - options: --user 0:0 --privileged - volumes: - - /home/buildbot/.ssh:/root/.ssh - steps: - - name: Checkout source code - uses: actions/checkout@v3 - - name: Waf Configure - env: - EXTRA_RESOLVE_OPTIONS: ${{ inputs.extra_resolve_options }} - uses: nick-fields/retry@v2 - with: - max_attempts: 3 - timeout_minutes: 15 - command: python3 waf configure --git_protocol=git@ ${{ env.EXTRA_RESOLVE_OPTIONS }} - - name: Waf Build - run: | - echo "::add-matcher::.github/gcc-problem-matcher.json" - python3 waf - - name: Waf Integration Test - run: python3 waf integration_test -concurrency: - group: ${{ github.workflow }}-${{ github.ref || github.run_id }} - cancel-in-progress: true diff --git a/CMakeLists.txt b/CMakeLists.txt index f0fddcf..0c027f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,26 +27,25 @@ ExternalProject_add(project_srt SOURCE_DIR ${STEINWURF_RESOLVE}/srt-source BINARY_DIR ${STEINWURF_RESOLVE}/srt-source/cmake_build INSTALL_DIR ${STEINWURF_RESOLVE}/srt-source/install - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${STEINWURF_RESOLVE}/srt-source/ + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${STEINWURF_RESOLVE}/srt-source/ -DENABLED_STATIC=ON -DENABLE_BONDING=ON -DENABLE_APPS=OFF -DENABLE_ENCRYPTION=OFF -DCMAKE_BUILD_TYPE=Debug BUILD_COMMAND ${CMAKE_COMMAND} --build ${STEINWURF_RESOLVE}/srt-source/cmake_build - CMAKE_CACHE_ARGS -DENABLED_STATIC=ON -DENABLE_BONDING=ON -DENABLE_APPS=OFF -DENABLE_ENCRYPTION=OFF -DCMAKE_BUILD_TYPE=Debug EXCLUDE_FROM_ALL TRUE - STEP_TARGETS build + STEP_TARGETS install INSTALL_COMMAND ${CMAKE_COMMAND} --install ${STEINWURF_RESOLVE}/srt-source/cmake_build --prefix ${STEINWURF_RESOLVE}/srt-source/install ) add_library(srt STATIC IMPORTED GLOBAL) set_target_properties(srt PROPERTIES IMPORTED_LOCATION ${STEINWURF_RESOLVE}/srt-source/install/lib/libsrt.a + ) -target_include_directories(srt INTERFACE ${STEINWURF_RESOLVE}/srt-source/install/include) + + add_dependencies(srt project_srt) add_library(steinwurf::srt ALIAS srt) -# # Include directories -# target_include_directories(steinwurf::srt INTERFACE ${STEINWURF_RESOLVE}/srt-source/install/include) # Is top level project? if (${PROJECT_NAME} STREQUAL ${STEINWURF_TOP_NAME})