Compare commits

...

3 Commits

Author SHA1 Message Date
Guy Shimko
45e3ba25cd build: Build make build and make pack sequentially
Building multiple targets in parallel may cause docker race conditions.
2025-01-15 23:20:47 +02:00
Guy Shimko
0971bfc768 build: delete package dir before redownloading it 2025-01-15 23:09:50 +02:00
Guy Shimko
7d4a19c440 build: always download and extract tars
This caused failures in our ci-cd. Always downloading & extracting the
tars makes sure we will redownload them & extract if the previous
download / extraction was faulty.
2025-01-15 22:58:34 +02:00
2 changed files with 6 additions and 10 deletions

View File

@ -13,6 +13,8 @@ BUILD_PACKAGES_DIR := "build/packages"
.PHONY: clean help download_packages build build-docker-image $(ALL_TARGETS) $(ALL_PACK_TARGETS)
.NOTPARALLEL: build pack
help:
@echo "Usage:"
@echo " make build"

View File

@ -64,11 +64,6 @@ function download_package() {
local url="$1"
local output="$2"
if [[ -f "$output" ]]; then
>&2 echo "Skipping download: $output already exists"
return 0
fi
wget "$url" -O "$output"
if [[ $? -ne 0 ]]; then
>&2 echo "Error: failed to download $url"
@ -98,11 +93,6 @@ function extract_package() {
return 1
fi
if [[ -d "$output_dir" ]]; then
>&2 echo "Skipping extraction: $output_dir already exists"
return 0
fi
pushd "$temp_dir" > /dev/null
unpack_tarball "$tarball_realpath"
@ -113,6 +103,10 @@ function extract_package() {
popd > /dev/null
# Make sure output dir is empty, so we could move content into it.
# The directory might not exist, so we need to pass || true so that set -e won't fail us.
rm -rf "$output_dir" || true
mv "$temp_dir/$package_dir" "$output_dir"
if [[ $? -ne 0 ]]; then
return 1