github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 16:27:52 +00:00
Code Issues Projects Releases Wiki Activity

CI: Use --abbrev=9 explicitly for abbreviated commit hash

Browse Source 
A length of the result of `git log -1 --pretty=format:%h` could vary
over different CI systems, highly likely messing up their caching
mechanisms.

This commit is to use an option `--abbrev=9` to standardize the length
to 9 characters for CI.

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi
2024-05-15 13:57:20 +02:00
parent 117e2f2ecc
commit e075150fbe
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -186,7 +186,7 @@ install_cached_tarball_component() {
fi
local component="${1}"
local current_version="${2}-$(git log -1 --pretty=format:"%h" ${repo_root_dir}/tools/packaging/kata-deploy/local-build)"
local current_version="${2}-$(git log -1 --abbrev=9 --pretty=format:"%h" ${repo_root_dir}/tools/packaging/kata-deploy/local-build)"
local current_image_version="${3}"
local component_tarball_name="${4}"
local component_tarball_path="${5}"
@@ -798,7 +798,7 @@ install_ovmf_sev() {
}
install_agent() {
latest_artefact="$(git log -1 --pretty=format:"%h" ${repo_root_dir}/src/agent)"
latest_artefact="$(git log -1 --abbrev=9 --pretty=format:"%h" ${repo_root_dir}/src/agent)"
latest_builder_image="$(get_agent_image_name)"
install_cached_tarball_component \
@@ -901,7 +901,7 @@ install_script_helper() {
install_tools_helper() {
tool=${1}
latest_artefact="$(git log -1 --pretty=format:"%h" ${repo_root_dir}/src/tools/${tool})"
latest_artefact="$(git log -1 --abbrev=9 --pretty=format:"%h" ${repo_root_dir}/src/tools/${tool})"
latest_builder_image="$(get_tools_image_name)"
install_cached_tarball_component \
@@ -1117,7 +1117,7 @@ handle_build() {
esac
pushd ${workdir}
echo "${latest_artefact}-$(git log -1 --pretty=format:"%h" ${repo_root_dir}/tools/packaging/kata-deploy/local-build)" > ${build_target}-version
echo "${latest_artefact}-$(git log -1 --abbrev=9 --pretty=format:"%h" ${repo_root_dir}/tools/packaging/kata-deploy/local-build)" > ${build_target}-version
echo "${latest_builder_image}" > ${build_target}-builder-image-version
sha256sum "${final_tarball_name}" > ${build_target}-sha256sum

2
tools/packaging/scripts/lib.sh
View File

@@ -113,7 +113,7 @@ get_last_modification() {
dirty=""
[ $(git status --porcelain | grep "${file#${repo_root_dir}/}" | wc -l) -gt 0 ] && dirty="-dirty"
echo "$(git log -1 --pretty=format:"%h" ${file})${dirty}"
echo "$(git log -1 --abbrev=9 --pretty=format:"%h" ${file})${dirty}"
popd &> /dev/null
}