Skip to content

Include artifact modes in build cache hash #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yoshifuminakamura merged 1 commit into from
Aug 27, 2026
Merged

Include artifact modes in build cache hash #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions scripts/build_with_cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ artifact_tree_hash() {
local hash_input
local rel
local path
local mode
local target

[ -d "$artifact_root" ] || return 1
Expand All @@ -201,9 +202,17 @@ artifact_tree_hash() {
[ -n "$rel" ] || continue
path="${artifact_root}/${rel#./}"
if [ -d "$path" ] && [ ! -L "$path" ]; then
printf 'D %s\n' "$(bk_base64_encode_value "$rel")" >> "$hash_input"
if ! mode=$(stat -c '%a' "$path"); then
rm -f "$file_list" "$hash_input"
return 1
fi
printf 'D %s %s\n' "$mode" "$(bk_base64_encode_value "$rel")" >> "$hash_input"
elif [ -f "$path" ] && [ ! -L "$path" ]; then
printf 'F %s %s\n' "$(bk_sha256_file "$path")" "$(bk_base64_encode_value "$rel")" >> "$hash_input"
if ! mode=$(stat -c '%a' "$path"); then
rm -f "$file_list" "$hash_input"
return 1
fi
printf 'F %s %s %s\n' "$mode" "$(bk_sha256_file "$path")" "$(bk_base64_encode_value "$rel")" >> "$hash_input"
elif [ -L "$path" ]; then
if ! target=$(readlink "$path"); then
rm -f "$file_list" "$hash_input"
Expand Down
13 changes: 11 additions & 2 deletions scripts/tests/test_build_cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ fi
count=$((count + 1))
printf '%s\n' "$count" > "${BK_TEST_BUILD_COUNT}"
printf 'artifact %s %s\n' "$system" "$BK_COMMIT_HASH" > artifacts/app.bin
chmod 755 artifacts/app.bin
EOF
chmod +x "${TMP_DIR}/project/programs/app/build.sh"

Expand Down Expand Up @@ -307,20 +308,28 @@ awk -F= '$1 == "BK_CACHE_SOURCE_INFO_SHA256" && length($2) == 64 {found=1} END {
awk -F= '$1 == "BK_CACHE_ARTIFACTS_SHA256" && length($2) == 64 {found=1} END {exit(found ? 0 : 1)}' \
"${integrity_cache_dir}/manifest.env"

printf 'tampered artifact\n' > "${integrity_cache_dir}/artifacts/app.bin"
chmod 644 "${integrity_cache_dir}/artifacts/app.bin"
rm -rf "${TMP_DIR}/project/artifacts" "${TMP_DIR}/project/results" "${TMP_DIR}/project/appsrc"
run_integrity_build_with_cache
test "$(cat "${TMP_DIR}/integrity-build-count")" = "2"
grep -q "$first_commit" "${TMP_DIR}/project/artifacts/app.bin"
test -x "${TMP_DIR}/project/artifacts/app.bin"
grep -q '^BK_BUILD_CACHE_STORED=true$' "${TMP_DIR}/project/results/build_cache.env"

printf '\n# tampered source info\n' >> "${integrity_cache_dir}/results/source_info.env"
printf 'tampered artifact\n' > "${integrity_cache_dir}/artifacts/app.bin"
rm -rf "${TMP_DIR}/project/artifacts" "${TMP_DIR}/project/results" "${TMP_DIR}/project/appsrc"
run_integrity_build_with_cache
test "$(cat "${TMP_DIR}/integrity-build-count")" = "3"
grep -q "$first_commit" "${TMP_DIR}/project/artifacts/app.bin"
grep -q '^BK_BUILD_CACHE_STORED=true$' "${TMP_DIR}/project/results/build_cache.env"

printf '\n# tampered source info\n' >> "${integrity_cache_dir}/results/source_info.env"
rm -rf "${TMP_DIR}/project/artifacts" "${TMP_DIR}/project/results" "${TMP_DIR}/project/appsrc"
run_integrity_build_with_cache
test "$(cat "${TMP_DIR}/integrity-build-count")" = "4"
grep -q "$first_commit" "${TMP_DIR}/project/artifacts/app.bin"
grep -q '^BK_BUILD_CACHE_STORED=true$' "${TMP_DIR}/project/results/build_cache.env"

rm -rf "${TMP_DIR}/project/artifacts" "${TMP_DIR}/project/results" "${TMP_DIR}/project/appsrc"
cp -a "${TMP_DIR}/project" "${TMP_DIR}/project-copy"
rm -rf "${TMP_DIR}/project-copy/artifacts" "${TMP_DIR}/project-copy/results" "${TMP_DIR}/project-copy/appsrc"
Expand Down
Loading