Skip to content

Commit

Permalink
Merge pull request #335 from rdkcentral/master
Browse files Browse the repository at this point in the history
Dobby Patch Release v3.10.3
  • Loading branch information
goruklu authored Sep 9, 2024
2 parents 16953c9 + 7be9d42 commit d891fdb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/L2-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ jobs:
uses: actions/setup-python@v4
with:
python-version: '3.x'
- run: pip install jsonref
pip install coverage
- run: |
pip install jsonref
pip install coverage
- name: Set up CMake
uses: jwlawson/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
cmake -DCMAKE_BUILD_TYPE=Debug -DRDK_PLATFORM=DEV_VM -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLEGACY_COMPONENTS=ON -DPLUGIN_TESTPLUGIN=ON -DPLUGIN_GPU=ON -DPLUGIN_LOCALTIME=ON -DPLUGIN_RTSCHEDULING=ON -DPLUGIN_HTTPPROXY=ON -DPLUGIN_APPSERVICES=ON -DPLUGIN_IONMEMORY=ON -DPLUGIN_DEVICEMAPPER=ON ..
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
queries: +security-and-quality
Expand All @@ -59,6 +59,6 @@ jobs:
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{ matrix.language }}"
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ cmake_minimum_required( VERSION 3.7.0 )
include(GNUInstallDirs)

# Project setup
project( Dobby VERSION "3.10.2" )
project( Dobby VERSION "3.10.3" )


# Set the major and minor version numbers of dobby (also used by plugins)
set( DOBBY_MAJOR_VERSION 3 )
set( DOBBY_MINOR_VERSION 10 )
set( DOBBY_MICRO_VERSION 2 )
set( DOBBY_MICRO_VERSION 3 )

set(INSTALL_CMAKE_DIR lib/cmake/Dobby)

Expand Down
5 changes: 4 additions & 1 deletion daemon/lib/source/DobbyManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,10 @@ void DobbyManager::cleanupContainersShutdown()
while (it != mContainers.end())
{
if ((it->second->state == DobbyContainer::State::Running) || \
(it->second->state == DobbyContainer::State::Paused))
(it->second->state == DobbyContainer::State::Paused) || \
(it->second->state == DobbyContainer::State::Hibernating) || \
(it->second->state == DobbyContainer::State::Hibernated) || \
(it->second->state == DobbyContainer::State::Awakening))
{
AI_LOG_INFO("Stopping container %s", it->first.c_str());
// By calling the "proper" stop method here, any listening services will be
Expand Down

0 comments on commit d891fdb

Please sign in to comment.