forked from espressif/esp-idf
ci: ensure macos selected the correct python installed by pyenv
This commit is contained in:
@@ -537,6 +537,7 @@ pytest_build_system_macos:
|
|||||||
extends:
|
extends:
|
||||||
- .test_build_system_template
|
- .test_build_system_template
|
||||||
- .before_script:build:macos
|
- .before_script:build:macos
|
||||||
|
- .after_script:build:macos:ccache:upload-when-fail
|
||||||
- .rules:build:macos
|
- .rules:build:macos
|
||||||
tags:
|
tags:
|
||||||
- macos_shell
|
- macos_shell
|
||||||
@@ -549,6 +550,8 @@ pytest_build_system_macos:
|
|||||||
expire_in: 2 days
|
expire_in: 2 days
|
||||||
reports:
|
reports:
|
||||||
junit: XUNIT_RESULT.xml
|
junit: XUNIT_RESULT.xml
|
||||||
|
variables:
|
||||||
|
PYENV_VERSION: "3.8"
|
||||||
|
|
||||||
build_docker:
|
build_docker:
|
||||||
extends:
|
extends:
|
||||||
|
@@ -52,7 +52,6 @@ variables:
|
|||||||
IDF_PATH: "$CI_PROJECT_DIR"
|
IDF_PATH: "$CI_PROJECT_DIR"
|
||||||
V: "0"
|
V: "0"
|
||||||
CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
|
CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"
|
||||||
PYTHON_VER: 3.8.17
|
|
||||||
|
|
||||||
# Docker images
|
# Docker images
|
||||||
ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.2:2"
|
ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.2:2"
|
||||||
@@ -196,6 +195,10 @@ variables:
|
|||||||
|
|
||||||
.before_script:build:macos:
|
.before_script:build:macos:
|
||||||
before_script:
|
before_script:
|
||||||
|
# macos is running shell executor, which means it would use
|
||||||
|
# the system installed /usr/local/bin/python3 by default.
|
||||||
|
# Ensure pyenv and PYENV_VERSION installed
|
||||||
|
- eval "$(pyenv init -)"
|
||||||
- *common-before_scripts
|
- *common-before_scripts
|
||||||
# On macOS, these tools need to be installed
|
# On macOS, these tools need to be installed
|
||||||
- export IDF_TOOLS_PATH="${HOME}/.espressif_runner_${CI_RUNNER_ID}_${CI_CONCURRENT_ID}"
|
- export IDF_TOOLS_PATH="${HOME}/.espressif_runner_${CI_RUNNER_ID}_${CI_CONCURRENT_ID}"
|
||||||
@@ -204,6 +207,15 @@ variables:
|
|||||||
- *setup_tools_and_idf_python_venv
|
- *setup_tools_and_idf_python_venv
|
||||||
- fetch_submodules
|
- fetch_submodules
|
||||||
|
|
||||||
|
.after_script:build:macos:ccache:upload-when-fail:
|
||||||
|
after_script:
|
||||||
|
# macos is running shell executor, which means it would use
|
||||||
|
# the system installed /usr/local/bin/python3 by default.
|
||||||
|
# Ensure pyenv and PYENV_VERSION installed
|
||||||
|
- eval "$(pyenv init -)"
|
||||||
|
- *show_ccache_statistics
|
||||||
|
- *upload_failed_job_log_artifacts
|
||||||
|
|
||||||
.before_script:build:
|
.before_script:build:
|
||||||
before_script:
|
before_script:
|
||||||
- *common-before_scripts
|
- *common-before_scripts
|
||||||
|
Reference in New Issue
Block a user