diff options
| -rw-r--r-- | .github/workflows/sdl_core_github_ci.yml | 44 | ||||
| -rw-r--r-- | .travis.yml | 32 | ||||
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | src/components/policy/policy_regular/CMakeLists.txt | 3 |
5 files changed, 54 insertions, 37 deletions
diff --git a/.github/workflows/sdl_core_github_ci.yml b/.github/workflows/sdl_core_github_ci.yml new file mode 100644 index 0000000000..d5700e8331 --- /dev/null +++ b/.github/workflows/sdl_core_github_ci.yml @@ -0,0 +1,44 @@ +name: SDL Core Build +on: [push, pull_request] +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - name: Init Submodules + run: git -C ${{ github.workspace }} submodule update --init --recursive + # Install Dependencies + - name: Apt Get Dependencies + run: sudo apt-get update && sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck python3-pip python3-setuptools && sudo apt-get install -f clang-format-6.0 + - name: Setup CMAKE + uses: jwlawson/actions-setup-cmake@v1.8 + with: + cmake-version: '3.16.3' + # Check Style + - name: Check Style + run: ${{ github.workspace }}/tools/infrastructure/check_style.sh + # Build Project + - name: Cache 3rd Party + id: core-3rd-party + uses: actions/cache@v2 + with: + path: ${{ github.workspace }}/core_3rd_party + key: ${{ runner.os }}-core-3rd-party-v3 + - name: Make 3rd Party Directory + if: steps.core-3rd-party.outputs.cache-hit != 'true' + run: mkdir ${{ github.workspace }}/core_3rd_party + - name: Make Directories + run: cd ${{ github.workspace }} && cd ../ && mkdir build && cd build + - name: Set 3rd Party Path + run: echo "THIRD_PARTY_INSTALL_PREFIX=${{ github.workspace }}/core_3rd_party" >> $GITHUB_ENV + - name: Set 3rd Party ARCH Path + run: echo "THIRD_PARTY_INSTALL_PREFIX_ARCH=${{ github.workspace }}/core_3rd_party" >> $GITHUB_ENV + - name: Configure + run: cmake ../sdl_core -DBUILD_TESTS=ON -DLOGGER_NAME=BOOST + - name: Build + run: make install-3rd_party && make -j `nproc` install + - name: Set Library Path + run: echo "LD_LIBRARY_PATH=$THIRD_PARTY_INSTALL_PREFIX/lib:." >> $GITHUB_ENV + # run tests + - name: Unit Tests + run: make test diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d180ba2a85..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,32 +0,0 @@ -language: cpp -dist: focal -sudo: required -only: - - master - - develop - - \/feature\/.+ - - \/fix\/.+ - - \/hotfix\/.+ - - \/release\/.+ - -addons: - apt: - sources: - - ubuntu-toolchain-r-test - -before_install: - - sudo apt-get update - - sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck python3-pip python3-setuptools - - sudo apt-get install -f clang-format-6.0 - -script: - - cppcheck --force -isrc/3rd_party -isrc/3rd_party-static --library=googletest --suppress=unknownMacro --suppress=syntaxError:*_test.cc --quiet --error-exitcode=1 src - - ./tools/infrastructure/check_style.sh - - mkdir build && cd build - - cmake ../ -DBUILD_TESTS=ON - - make install-3rd_party && make -j `nproc` install && sudo ldconfig && make test -env: - global: - - LC_CTYPE=en_US.UTF-8 - - CTEST_OUTPUT_ON_FAILURE=TRUE - - LD_LIBRARY_PATH=. diff --git a/CMakeLists.txt b/CMakeLists.txt index 844319ed62..07e5bd5b56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -444,6 +444,11 @@ if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "LOG4CXX") include_directories ( ${LOG4CXX_INCLUDE_DIRECTORY} ) endif() +if(ENABLE_LOG AND ${LOGGER_NAME} STREQUAL "BOOST") + message(STATUS "Including boost") + include_directories ( ${BOOST_INCLUDE_DIR} ) +endif() + if(ENABLE_SECURITY) add_definitions(-DENABLE_SECURITY) set(SecurityManagerLibrary SecurityManager) @@ -1,7 +1,8 @@ [](http://slack.smartdevicelink.com) -[](https://opensdl-jenkins.prjdmz.luxoft.com/job/develop_weekly_coverage/) -[](https://opensdl-jenkins.prjdmz.luxoft.com/view/Smokes/job/Develop_TCP_ATF_Smoke_P/) -[](https://opensdl-jenkins.prjdmz.luxoft.com/job/Develop_SDL_Checkstyle/) +[](https://github.com/smartdevicelink/sdl_core/actions/workflows/sdl_core_github_ci.yml) +[](https://opensdl-jenkins.prjdmz.luxoft.com/job/develop_weekly_coverage/) +[](https://opensdl-jenkins.prjdmz.luxoft.com/view/Smokes/job/Develop_TCP_ATF_Smoke_P/) +[](https://opensdl-jenkins.prjdmz.luxoft.com/job/Develop_SDL_Checkstyle/) # SmartDeviceLink (SDL) diff --git a/src/components/policy/policy_regular/CMakeLists.txt b/src/components/policy/policy_regular/CMakeLists.txt index 85ba86cfba..39c520a0e3 100644 --- a/src/components/policy/policy_regular/CMakeLists.txt +++ b/src/components/policy/policy_regular/CMakeLists.txt @@ -85,7 +85,6 @@ generate_policy_types("${GENERATED_HMI_POLICY_TYPES}" set(POLICY_TABLE_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/include/policy/policy_table ${CMAKE_CURRENT_SOURCE_DIR}/src/policy_table - ${CMAKE_CURRENT_BINARY_DIR}/ ) set(POLICY_TABLE_SOURCES @@ -124,6 +123,7 @@ set(PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src ${COMPONENTS_DIR}/rpc_base/src/rpc_base/rpc_base.cc ) + collect_sources(SOURCES "${PATHS}" "${EXCLUDE_PATHS}") set(LIBRARIES @@ -142,7 +142,6 @@ else () list(APPEND LIBRARIES sqlite3) endif () - add_library(PolicyStatic ${SOURCES}) target_link_libraries(PolicyStatic ${LIBRARIES}) |