Skip to content

Commit 761f400

Browse files
committed
Merge branch 'ci/pythonpath_fix' into 'master'
ci: move pythonpath setting after IDF export script See merge request espressif/esp-idf-monitor!73
2 parents cb1f73c + c032cdc commit 761f400

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,11 @@ workflow:
148148
when: always
149149
expire_in: 1 week
150150
variables:
151-
PYTHONPATH: "$PYTHONPATH:${TEST_DIR}"
152151
COVERAGE_PROCESS_START: "${CI_PROJECT_DIR}/pyproject.toml"
153152
IDF_TARGET: "esp32"
154153
script:
154+
# setting PYTHONPATH before running activate script on newest IDF will cause an error because of missing coverage
155+
- PYTHONPATH="$PYTHONPATH:${TEST_DIR}"
155156
- cd ${TEST_DIR}/test_apps
156157
- pytest --junit-xml=${TEST_DIR}/results_${IDF_TARGET}_${IDF_BRANCH}.xml --target=${IDF_TARGET}
157158

@@ -206,9 +207,10 @@ host_test:
206207
- ".coverage*"
207208
expire_in: 1 week
208209
variables:
209-
PYTHONPATH: "$PYTHONPATH:${TEST_DIR}"
210210
COVERAGE_PROCESS_START: "${CI_PROJECT_DIR}/pyproject.toml"
211211
script:
212+
# setting PYTHONPATH before running activate script on newest IDF will cause an error because of missing coverage
213+
- PYTHONPATH="$PYTHONPATH:${TEST_DIR}"
212214
- cd ${TEST_DIR}
213215
- coverage run -m pytest -sv host_test/test_monitor.py
214216

0 commit comments

Comments
 (0)