From 8cfc7d042b428daac2cd5f5c8409ba7e9772b791 Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Thu, 1 Feb 2024 13:06:23 +0300 Subject: [PATCH 1/3] Fix run scripts --- .../install-dependencies-for-docker-image-without-utbot.sh | 2 +- docker/release_distribution_scripts/utbot_run_system.sh | 2 +- docker/release_distribution_scripts/utbot_server_restart.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh b/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh index 4aeba242..eaa37f26 100644 --- a/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh +++ b/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh @@ -6,7 +6,7 @@ set -e sudo apt update && sudo apt install -y build-essential cmake # install clang -sudo apt update && sudo apt -y install clang-10 +sudo apt update && sudo apt -y install clang-14 #install git for gtest sudo apt install -y software-properties-common diff --git a/docker/release_distribution_scripts/utbot_run_system.sh b/docker/release_distribution_scripts/utbot_run_system.sh index 11213c9e..73531ad7 100644 --- a/docker/release_distribution_scripts/utbot_run_system.sh +++ b/docker/release_distribution_scripts/utbot_run_system.sh @@ -114,7 +114,7 @@ then #Server-specific parameters UTBOT_EXECUTABLE_PATH=$UTBOT_BINARIES_FOLDER/$UTBOT_PROCESS_PATTERN - UTBOT_SERVER_OPTIONS="server --port $UTBOT_PORT --log=$UTBOT_LOGS_FOLDER" + UTBOT_SERVER_OPTIONS="--log=$UTBOT_LOGS_FOLDER server --port $UTBOT_PORT" UTBOT_STDOUT_LOG_FILE=$UTBOT_LOGS_FOLDER/logs/"latest.log" log "Starting a new server process; logs are written into [$UTBOT_LOGS_FOLDER] folder" diff --git a/docker/release_distribution_scripts/utbot_server_restart.sh b/docker/release_distribution_scripts/utbot_server_restart.sh index f13dd7f3..dc1a08a8 100644 --- a/docker/release_distribution_scripts/utbot_server_restart.sh +++ b/docker/release_distribution_scripts/utbot_server_restart.sh @@ -11,7 +11,7 @@ fi #Prompt kill all running UTBot servers with same port IFS=";" -RUNNING=$( ps aux | grep "utbot server" | grep -v grep | grep "\-\-port $UTBOT_PORT" ) +RUNNING=$( ps aux | grep "utbot .*server" | grep -v grep | grep "\-\-port $UTBOT_PORT" ) if test -n "$RUNNING" then From f03121c4b0784e44ee0e9bc963a0dce236c7f2bd Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Thu, 1 Feb 2024 13:48:48 +0300 Subject: [PATCH 2/3] build portable container bump ubuntu version --- .../install-dependencies-for-docker-image-without-utbot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh b/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh index eaa37f26..4aeba242 100644 --- a/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh +++ b/docker/action-scripts/install-dependencies-for-docker-image-without-utbot.sh @@ -6,7 +6,7 @@ set -e sudo apt update && sudo apt install -y build-essential cmake # install clang -sudo apt update && sudo apt -y install clang-14 +sudo apt update && sudo apt -y install clang-10 #install git for gtest sudo apt install -y software-properties-common From 88e78930a3b90fe6dd86756fdaf9db845bcdcde3 Mon Sep 17 00:00:00 2001 From: Vladislav Kalugin Date: Fri, 2 Feb 2024 13:32:37 +0300 Subject: [PATCH 3/3] Change log level --- server/src/building/ProjectBuildDatabse.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/building/ProjectBuildDatabse.cpp b/server/src/building/ProjectBuildDatabse.cpp index 96841c59..2f38d604 100644 --- a/server/src/building/ProjectBuildDatabse.cpp +++ b/server/src/building/ProjectBuildDatabse.cpp @@ -91,7 +91,7 @@ void ProjectBuildDatabase::initObjects(const nlohmann::json &compileCommandsJson } else { jsonArguments = std::vector(compileCommand.at("arguments")); } - LOG_S(INFO) << "Processing build command: " << StringUtils::joinWith(jsonArguments, " "); + LOG_S(MAX) << "Processing build command: " << StringUtils::joinWith(jsonArguments, " "); std::transform(jsonArguments.begin(), jsonArguments.end(), jsonArguments.begin(), [&directory](const std::string &argument) { return tryConvertOptionToPath(argument, directory); @@ -188,13 +188,13 @@ void ProjectBuildDatabase::initInfo(const nlohmann::json &linkCommandsJson, bool } else { jsonArguments = std::vector(linkCommand.at("arguments")); } - LOG_S(INFO) << "Processing link command: " << StringUtils::joinWith(jsonArguments, " "); + LOG_S(MAX) << "Processing link command: " << StringUtils::joinWith(jsonArguments, " "); if (StringUtils::endsWith(jsonArguments[0], "ranlib")) { - LOG_S(INFO) << "Skip ranlib command"; + LOG_S(MAX) << "Skip ranlib command"; continue; } if (StringUtils::endsWith(jsonArguments[0], "cmake")) { - LOG_S(INFO) << "Skip cmake command"; + LOG_S(MAX) << "Skip cmake command"; continue; } std::transform(jsonArguments.begin(), jsonArguments.end(), jsonArguments.begin(),