Skip to content

Commit 0611d22

Browse files
author
Dawid Planeta
committed
Enable venv before tests
1 parent 36a1f75 commit 0611d22

3 files changed

Lines changed: 36 additions & 14 deletions

File tree

.github/workflows/anjay-tests.yml

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2017-2025 AVSystem <avsystem@avsystem.com>
1+
# Copyright ##year## AVSystem <avsystem@avsystem.com>
22
# AVSystem Anjay LwM2M SDK
33
# All rights reserved.
44
#
@@ -24,8 +24,12 @@ jobs:
2424
- run: apt-get update
2525
- run: apt-get -y install $CC $CXX
2626
- run: ./devconfig --with-valgrind --without-analysis -DWITH_VALGRIND_TRACK_ORIGINS=OFF -DWITH_IPV6=OFF
27-
- run: env CC=gcc LC_ALL=C.UTF-8 make -j
28-
- run: env CC=gcc LC_ALL=C.UTF-8 make check
27+
- run: |
28+
. /venv/bin/activate
29+
env CC=gcc LC_ALL=C.UTF-8 make -j
30+
- run: |
31+
. /venv/bin/activate
32+
env CC=gcc LC_ALL=C.UTF-8 make check
2933
strategy:
3034
fail-fast: false
3135
matrix:
@@ -56,8 +60,12 @@ jobs:
5660
- run: apt-get update
5761
- run: apt-get -y install $CC $CXX
5862
- run: ./devconfig $MEM_CHECK_TOOL --without-analysis -DWITH_VALGRIND_TRACK_ORIGINS=OFF -DWITH_IPV6=OFF
59-
- run: env CC=gcc LC_ALL=C.UTF-8 make -j
60-
- run: env CC=gcc LC_ALL=C.UTF-8 make check
63+
- run: |
64+
. /venv/bin/activate
65+
env CC=gcc LC_ALL=C.UTF-8 make -j
66+
- run: |
67+
. /venv/bin/activate
68+
env CC=gcc LC_ALL=C.UTF-8 make check
6169
strategy:
6270
fail-fast: false
6371
matrix:
@@ -98,8 +106,12 @@ jobs:
98106
- run: apt-get update
99107
- run: apt-get -y install $CC $CXX
100108
- run: ./devconfig $MEM_CHECK_TOOL --without-analysis -DWITH_VALGRIND_TRACK_ORIGINS=OFF -DWITH_IPV6=OFF
101-
- run: env CC=gcc LC_ALL=C.UTF-8 make -j
102-
- run: env CC=gcc LC_ALL=C.UTF-8 make check
109+
- run: |
110+
. /venv/bin/activate
111+
env CC=gcc LC_ALL=C.UTF-8 make -j
112+
- run: |
113+
. /venv/bin/activate
114+
env CC=gcc LC_ALL=C.UTF-8 make check
103115
strategy:
104116
fail-fast: false
105117
matrix:
@@ -141,8 +153,12 @@ jobs:
141153
# Solve issues with EPERM when running dumpcap
142154
- run: setcap '' $(which dumpcap)
143155
- run: ./devconfig --with-valgrind --without-analysis -DWITH_VALGRIND_TRACK_ORIGINS=OFF -DWITH_IPV6=OFF
144-
- run: env CC=gcc LC_ALL=C.UTF-8 make -j
145-
- run: env CC=gcc LC_ALL=C.UTF-8 make check
156+
- run: |
157+
. /venv/bin/activate
158+
env CC=gcc LC_ALL=C.UTF-8 make -j
159+
- run: |
160+
. /venv/bin/activate
161+
env CC=gcc LC_ALL=C.UTF-8 make check
146162
strategy:
147163
fail-fast: false
148164
matrix:
@@ -177,10 +193,15 @@ jobs:
177193
- run: brew install embedded/mbedtls/mbedtls
178194
- run: brew pin mbedtls
179195
# NOTE: The above command may have installed a new version of Python, that's why we launch it weirdly
180-
- run: /usr/bin/env python3 -m pip install -r requirements.txt --break-system-packages
196+
# NOTE: We manualy create env since devconfig does not use /usr/bin/env python3
197+
- run: /usr/bin/env python3 -m venv venv
181198
- run: env JAVA_HOME="$JAVA_HOME_17_X64" ./devconfig --with-asan --without-analysis --no-examples -DWITH_VALGRIND_TRACK_ORIGINS=OFF -DWITH_IPV6=OFF -DMBEDTLS_ROOT_DIR=/opt/homebrew/opt/mbedtls
182-
- run: LC_ALL=en_US.UTF-8 make -j
183-
- run: LC_ALL=en_US.UTF-8 make check
199+
- run: |
200+
. venv/bin/activate
201+
LC_ALL=en_US.UTF-8 make -j
202+
- run: |
203+
. venv/bin/activate
204+
LC_ALL=en_US.UTF-8 make check
184205
strategy:
185206
fail-fast: false
186207
matrix:

cmake/requirePython3venv.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# See the attached LICENSE file for details.
77

88
include_guard(GLOBAL)
9+
set(Python_FIND_FRAMEWORK LAST)
910
set(Python3_FIND_VIRTUALENV ONLY)
1011
find_package(Python3 3.5 REQUIRED COMPONENTS Interpreter)
1112

devconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,11 @@ if python3 -c 'import sys; exit(0) if sys.base_prefix != sys.prefix else exit(1)
137137
echo "Using already activated Python venv"
138138
else
139139
if [ ! -d "${VENV_DIR}" ]; then
140-
echo "Creating Python venv in /${VENV_DIR}"
140+
echo "Creating Python venv in ${VENV_DIR}"
141141
python3 -m venv "${VENV_DIR}"
142142
fi
143143
144-
echo "Activating Python venv in /${VENV_DIR}"
144+
echo "Activating Python venv in ${VENV_DIR}"
145145
146146
# shellcheck disable=SC1091
147147
source "${VENV_DIR}/bin/activate"

0 commit comments

Comments
 (0)