diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml index c0076a4d..a8dbfc3a 100755 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -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/actions-setup-cmake@v1.14 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index c942d8d4..f42628f3 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -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 @@ -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 }}" diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e0e2b22..22b7dd27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/daemon/lib/source/DobbyManager.cpp b/daemon/lib/source/DobbyManager.cpp index 272423f8..2353da57 100644 --- a/daemon/lib/source/DobbyManager.cpp +++ b/daemon/lib/source/DobbyManager.cpp @@ -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