From 9f21b763ad7911a1398bf5644c6e5be890cbdba1 Mon Sep 17 00:00:00 2001 From: turuslan Date: Wed, 3 Apr 2024 10:16:54 +0500 Subject: [PATCH 1/2] link --- src/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b710533..a412d39 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -87,6 +87,7 @@ add_library(configurator_yaml target_link_libraries(configurator_yaml yaml-cpp::yaml-cpp configurator + logging_system ) add_library(fallback_configurator @@ -100,6 +101,8 @@ add_library(logging_system logging_system.cpp ) target_link_libraries(logging_system + group + logger sink sink_to_nowhere ) From 476a1f4fb7696d138705d0e3df90c5039af1e921 Mon Sep 17 00:00:00 2001 From: turuslan Date: Wed, 3 Apr 2024 10:48:31 +0500 Subject: [PATCH 2/2] venv --- .github/aux/github_venv.sh | 11 +++++++++++ .github/workflows/compilers.yml | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100755 .github/aux/github_venv.sh diff --git a/.github/aux/github_venv.sh b/.github/aux/github_venv.sh new file mode 100755 index 0000000..c38889d --- /dev/null +++ b/.github/aux/github_venv.sh @@ -0,0 +1,11 @@ +# +# Copyright Quadrivium LLC +# All Rights Reserved +# SPDX-License-Identifier: Apache-2.0 +# + +GITHUB_ENV="${GITHUB_ENV:?}" +export VIRTUAL_ENV="${1:?venv path not set}" +export PATH="$VIRTUAL_ENV/bin:$PATH" +echo "VIRTUAL_ENV=$VIRTUAL_ENV" >> "$GITHUB_ENV" +echo "PATH=$PATH" >> "$GITHUB_ENV" diff --git a/.github/workflows/compilers.yml b/.github/workflows/compilers.yml index 4a5b007..a368d45 100644 --- a/.github/workflows/compilers.yml +++ b/.github/workflows/compilers.yml @@ -41,6 +41,9 @@ jobs: clean: true fetch-depth: 1 + - name: venv + run: python3 -m venv --upgrade-deps ~/venv && .github/aux/github_venv.sh $_ + - name: install dependencies run: | set -e @@ -60,9 +63,8 @@ jobs: sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-13 90 fi - sudo python3 -m pip install --upgrade pip - sudo python3 -m pip install scikit-build - sudo python3 -m pip install cmake==3.25 requests gitpython gcovr pyyaml + pip3 install scikit-build + pip3 install cmake==3.25 requests gitpython gcovr pyyaml - name: cmake env: