espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 11:44:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
ci: use different base commit for merge result pipelines (v5.4)

See merge request espressif/esp-idf!34582
This commit is contained in:
Sergei Silnov
2024-11-05 01:07:13 +08:00
parent 0e6c74e93d 5f62667aba
commit a2ffd9e955
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab/ci/pre_check.yml
View File

@@ -183,12 +183,24 @@ baseline_manifest_sha:
tags: [fast_run, shiny] tags: [fast_run, shiny]
script: script:
- | - |
if [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then # merged results pipelines, by default
# diff between target-branch-head and merged-result-head
if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ]; then
git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_SHA --depth=1
git checkout FETCH_HEAD
idf-build-apps dump-manifest-sha \
--manifest-files $(find . -name ".build-test-rules.yml" | xargs) \
--output .manifest_sha
# merge request pipelines, when the mr got conflicts
# diff between diff-base-sha and merge-request-head
elif [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1 git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1
git checkout FETCH_HEAD git checkout FETCH_HEAD
idf-build-apps dump-manifest-sha \ idf-build-apps dump-manifest-sha \
--manifest-files $(find . -name ".build-test-rules.yml" | xargs) \ --manifest-files $(find . -name ".build-test-rules.yml" | xargs) \
--output .manifest_sha --output .manifest_sha
# other pipelines, like the protected branches pipelines
# not triggered in this job
fi fi
artifacts: artifacts:
paths: paths: