updated container version for UTBot build

Author: Alexey Pleshakov

.github/workflows/build-utbot.yml

@@ -1,7 +1,7 @@
 name: Build UTBot and run unit tests
 
 on:
-#  push:
+  push:
   pull_request:
     branches: [main]
 
@@ -12,10 +12,15 @@ jobs:
       # It is impossible to parametrize image via workflow environment,
       # so its name is hard-coded.
       # https://github.com/actions/runner/issues/480
-      image: ghcr.io/unittestbot/utbotcpp/base_env:github-ci
+      image: ghcr.io/unittestbot/utbotcpp/base_env:20-10-2021
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
+      env:
+        UTBOT_ALL: /utbot_distr
+        UTBOT_INSTALL_DIR: /utbot_distr/install
+        GRPC_PATH: /utbot_distr/install
+        CLI_PATH: /utbot_distr/cli
     steps:
       - name: Install git
         run: |
@@ -44,7 +49,7 @@ jobs:
     needs: build
     runs-on: ubuntu-18.04
     container:
-      image: ghcr.io/unittestbot/utbotcpp/base_env:github-ci
+      image: ghcr.io/unittestbot/utbotcpp/base_env:20-10-2021
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-base-env.yml

@@ -1,7 +1,7 @@
 name: Publish UTBot base environment image
 on:
-  push:
-#  workflow_dispatch:
+#  push:
+  workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io

server/CMakeLists.txt

@@ -41,17 +41,18 @@ add_definitions(-DLOGURU_WITH_STREAMS=1)
 SET(GCC_COVERAGE_LINK_FLAGS "-lpthread -ldl")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
 
-set(LOGGER_DIR "${PROJECT_SOURCE_DIR}/loguru")
+get_filename_component(UTBOT_DIR ${PROJECT_SOURCE_DIR} DIRECTORY)
+set(LOGGER_DIR "${UTBOT_DIR}/loguru")
 add_library(loguru ${LOGGER_DIR}/loguru.cpp)
 include_directories(${LOGGER_DIR})
 
-set(JSON_PATH "${PROJECT_SOURCE_DIR}/json")
+set(JSON_PATH "${UTBOT_DIR}/json")
 include_directories(${JSON_PATH}/include)
 
-set(TSL_PATH "${PROJECT_SOURCE_DIR}/ordered-map")
+set(TSL_PATH "${UTBOT_DIR}/ordered-map")
 include_directories(${TSL_PATH}/include)
 
-set(PARALLEL_HASHMAP_PATH "${PROJECT_SOURCE_DIR}/parallel-hashmap")
+set(PARALLEL_HASHMAP_PATH "${UTBOT_DIR}/parallel-hashmap")
 include_directories(${PARALLEL_HASHMAP_PATH})
 
 set(KLEE_PATH $ENV{UTBOT_ALL}/klee/)