Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

ci: cleanup after_script:build related rules

Browse Source
This commit is contained in:
Fu Hanxi
2025-11-24 15:00:00 +01:00
parent 6c0cac7a76
commit 1d1237d4c0
4 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/ci/build.yml
+2 -2
View File
@@ -1,7 +1,7 @@
.build_template: .build_template:
stage: build stage: build
extends: extends:
- .after_script:build:ccache-show-stats:upload-failed-job-logs - .after_script:build
image: $ESP_ENV_IMAGE image: $ESP_ENV_IMAGE
tags: [build, shiny] tags: [build, shiny]
variables: variables:
@@ -13,7 +13,7 @@
extends: extends:
- .build_template - .build_template
- .before_script:build - .before_script:build
- .after_script:build:ccache-show-stats - .after_script:build
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
.gitlab/ci/common.yml
+3 -10
View File
@@ -224,7 +224,9 @@ variables:
.show_ccache_statistics: &show_ccache_statistics | .show_ccache_statistics: &show_ccache_statistics |
# Show ccache statistics if enabled globally # Show ccache statistics if enabled globally
section_start "ccache_show_stats" "Show ccache statistics"
test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats -vv || true test "$CI_CCACHE_STATS" == 1 && test -n "$(which ccache)" && ccache --show-stats -vv || true
section_end "ccache_show_stats"
.upload_failed_job_log_artifacts: &upload_failed_job_log_artifacts | .upload_failed_job_log_artifacts: &upload_failed_job_log_artifacts |
if [ $CI_JOB_STATUS = "failed" ]; then if [ $CI_JOB_STATUS = "failed" ]; then
@@ -244,19 +246,10 @@ 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-show-stats: .after_script:build:
after_script: after_script:
- source tools/ci/utils.sh - source tools/ci/utils.sh
- section_start "ccache_show_stats" "Show ccache statistics"
- *show_ccache_statistics - *show_ccache_statistics
- section_end "ccache_show_stats"
.after_script:build:ccache-show-stats:upload-failed-job-logs:
after_script:
- source tools/ci/utils.sh
- section_start "ccache_show_stats" "Show ccache statistics"
- *show_ccache_statistics
- section_end "ccache_show_stats"
- *upload_failed_job_log_artifacts - *upload_failed_job_log_artifacts
############################## ##############################
.gitlab/ci/rules.yml
-3
View File
@@ -59,9 +59,6 @@
.patterns-build_system_win: &patterns-build_system_win .patterns-build_system_win: &patterns-build_system_win
- "tools/test_build_system/**/*" - "tools/test_build_system/**/*"
.patterns-build_macos: &patterns-build_macos
- "tools/ci/test_configure_ci_environment.sh"
.patterns-build_check: &patterns-build_check .patterns-build_check: &patterns-build_check
- "tools/test_build_system/**/*" - "tools/test_build_system/**/*"
- "tools/ci/test_configure_ci_environment.sh" - "tools/ci/test_configure_ci_environment.sh"
tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml
+1 -1
View File
@@ -7,7 +7,7 @@
.dynamic_build_template: .dynamic_build_template:
extends: extends:
- .before_script:build - .before_script:build
- .after_script:build:ccache-show-stats:upload-failed-job-logs - .after_script:build
image: $ESP_ENV_IMAGE image: $ESP_ENV_IMAGE
tags: [build, shiny] tags: [build, shiny]
stage: build stage: build