blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ci/fix_macos_ccache_v5.4' into 'release/v5.4'

Browse Source 
CI: Fix failing ccache and show ccache statistics for macOS tests (master) (v5.4)

See merge request espressif/esp-idf!34758
This commit is contained in:
Sergei Silnov 2024-11-08 19:46:14 +08:00
commit 68d680bafd
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab/ci/build.yml
View File

@ -1,7 +1,7 @@
.build_template: .build_template:
stage: build stage: build
extends: extends:
- .after_script:build:ccache:upload-when-fail - .after_script:build:ccache-show-stats:upload-failed-job-logs
image: $ESP_ENV_IMAGE image: $ESP_ENV_IMAGE
tags: tags:
- build - build
@ -16,7 +16,7 @@
extends: extends:
- .build_template - .build_template
- .before_script:build - .before_script:build
- .after_script:build:ccache - .after_script:build:ccache-show-stats
dependencies: # set dependencies to null to avoid missing artifacts issue dependencies: # set dependencies to null to avoid missing artifacts issue
needs: needs:
- job: fast_template_app - job: fast_template_app
@ -246,15 +246,16 @@ 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:upload-when-fail - .after_script:build:macos:upload-failed-job-logs:ccache-show-stats
- .rules:build:macos - .rules:build:macos
tags: tags:
- macos_shell - macos_shell
parallel: 3 parallel: 3
variables: variables:
PYENV_VERSION: "3.8" PYENV_VERSION: "3.8"
CI_CCACHE_DISABLE: "1" # ccache: error: Read-only file system # CCACHE_DIR: "/cache/idf_ccache". On macOS, you cannot write to this folder due to insufficient permissions.
CCACHE_DIR: "" # ccache will use "$HOME/Library/Caches/ccache".
CCACHE_MAXSIZE: "5G" # To preserve the limited Macbook storage. CCACHE automatically prunes old caches to fit the set limit.
build_docker: build_docker:
extends: extends:
- .before_script:minimal - .before_script:minimal

7
.gitlab/ci/common.yml
View File

@ -227,13 +227,14 @@ variables:
- *setup_tools_and_idf_python_venv - *setup_tools_and_idf_python_venv
- fetch_submodules - fetch_submodules
.after_script:build:macos:upload-when-fail: .after_script:build:macos:upload-failed-job-logs:ccache-show-stats:
after_script: after_script:
# macos is running shell executor, which means it would use # macos is running shell executor, which means it would use
# the system installed /usr/local/bin/python3 by default. # the system installed /usr/local/bin/python3 by default.
# Ensure pyenv and PYENV_VERSION installed # Ensure pyenv and PYENV_VERSION installed
- eval "$(pyenv init -)" - eval "$(pyenv init -)"
- *upload_failed_job_log_artifacts - *upload_failed_job_log_artifacts
- *show_ccache_statistics
.before_script:build: .before_script:build:
before_script: before_script:
@ -244,11 +245,11 @@ variables:
- export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
- export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS} - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}
.after_script:build:ccache: .after_script:build:ccache-show-stats:
after_script: after_script:
- *show_ccache_statistics - *show_ccache_statistics
.after_script:build:ccache:upload-when-fail: .after_script:build:ccache-show-stats:upload-failed-job-logs:
after_script: after_script:
- *show_ccache_statistics - *show_ccache_statistics
- *upload_failed_job_log_artifacts - *upload_failed_job_log_artifacts

6
tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
View File

@ -7,7 +7,7 @@
.dynamic_build_template: .dynamic_build_template:
extends: extends:
- .before_script:build - .before_script:build
- .after_script:build:ccache:upload-when-fail - .after_script:build:ccache-show-stats:upload-failed-job-logs
image: $ESP_ENV_IMAGE image: $ESP_ENV_IMAGE
stage: build stage: build
variables: variables:
@ -64,8 +64,8 @@
- pytest-embedded/ - pytest-embedded/
# Child pipeline reports won't be collected in the main one # Child pipeline reports won't be collected in the main one
# https://gitlab.com/groups/gitlab-org/-/epics/8205 # https://gitlab.com/groups/gitlab-org/-/epics/8205
# reports: # reports:
# junit: XUNIT_RESULT.xml # junit: XUNIT_RESULT.xml
when: always when: always
expire_in: 1 week expire_in: 1 week
script: script: