feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

ci: checkout back to merged result commit again to get the latest files

Browse Source
This commit is contained in:
Fu Hanxi
2024-08-08 10:43:27 +02:00
parent 997512ace2
commit 350f1410d3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab/ci/common.yml
View File

@@ -288,8 +288,8 @@ variables:
git remote add origin "${CI_REPOSITORY_URL}" git remote add origin "${CI_REPOSITORY_URL}"
fi fi
.git_checkout_fetch_head: &git_checkout_fetch_head | .git_checkout_ci_commit_sha: &git_checkout_ci_commit_sha |
git checkout FETCH_HEAD git checkout $CI_COMMIT_SHA
git clean ${GIT_CLEAN_FLAGS} git clean ${GIT_CLEAN_FLAGS}
# git diff requires two commits, with different CI env var # git diff requires two commits, with different CI env var
@@ -313,6 +313,7 @@ variables:
git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS} git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
git fetch origin $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS} git fetch origin $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
export GIT_DIFF_OUTPUT=$(git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA) export GIT_DIFF_OUTPUT=$(git diff --name-only $CI_MERGE_REQUEST_DIFF_BASE_SHA $CI_MERGE_REQUEST_SOURCE_BRANCH_SHA)
git fetch origin $CI_COMMIT_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
# merge request pipelines, when the mr got conflicts # merge request pipelines, when the mr got conflicts
elif [[ -n $CI_MERGE_REQUEST_DIFF_BASE_SHA ]]; then elif [[ -n $CI_MERGE_REQUEST_DIFF_BASE_SHA ]]; then
git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS} git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
@@ -328,7 +329,7 @@ variables:
git fetch origin $CI_COMMIT_SHA --depth=2 ${GIT_FETCH_EXTRA_FLAGS} git fetch origin $CI_COMMIT_SHA --depth=2 ${GIT_FETCH_EXTRA_FLAGS}
export GIT_DIFF_OUTPUT=$(git diff --name-only $CI_COMMIT_SHA~1 $CI_COMMIT_SHA) export GIT_DIFF_OUTPUT=$(git diff --name-only $CI_COMMIT_SHA~1 $CI_COMMIT_SHA)
fi fi
- *git_checkout_fetch_head - *git_checkout_ci_commit_sha
- *common-before_scripts - *common-before_scripts
- *setup_tools_and_idf_python_venv - *setup_tools_and_idf_python_venv
- add_gitlab_ssh_keys - add_gitlab_ssh_keys
@@ -342,7 +343,7 @@ variables:
- *git_init - *git_init
- *git_fetch_from_mirror_url_if_exists - *git_fetch_from_mirror_url_if_exists
- git fetch origin "${CI_COMMIT_SHA}" --depth=1 ${GIT_FETCH_EXTRA_FLAGS} - git fetch origin "${CI_COMMIT_SHA}" --depth=1 ${GIT_FETCH_EXTRA_FLAGS}
- *git_checkout_fetch_head - *git_checkout_ci_commit_sha
- *common-before_scripts - *common-before_scripts
- *setup_tools_and_idf_python_venv - *setup_tools_and_idf_python_venv
- add_gitlab_ssh_keys - add_gitlab_ssh_keys