workflows changes 7

scripts/release/images/ubuntu/build.sh

@@ -1,3 +1,11 @@
 #!/bin/sh
 cd "$(dirname "$0")"
-docker build -t p2pool_build_ubuntu .
+cache_args=""
+if [ -n "${P2POOL_BUILD_CACHE:-}" ]; then
+	cache_dir="${P2POOL_BUILD_CACHE%/}/base"
+	mkdir -p "$cache_dir"
+	export DOCKER_BUILDKIT=1
+	cache_args="--build-arg BUILDKIT_INLINE_CACHE=1 --cache-from type=local,src=$cache_dir --cache-to type=local,dest=$cache_dir,mode=max"
+fi
+
+docker build $cache_args -t p2pool_build_ubuntu .

scripts/release/linux_x64/build.sh

@@ -6,7 +6,6 @@ set -eu
 cd "$(dirname "$0")"
 
 repo_root="$(cd ../../.. && pwd)"
-checkout_ref="$(git -C "$repo_root" rev-parse HEAD)"
 
 if [ "${2:-}" ]; then
 	cpu_set="--cpuset-cpus $2"
@@ -14,9 +13,17 @@ else
 	cpu_set=""
 fi
 
+cache_args=""
+if [ -n "${P2POOL_BUILD_CACHE:-}" ]; then
+	cache_dir="${P2POOL_BUILD_CACHE%/}/linux_x64"
+	mkdir -p "$cache_dir"
+	export DOCKER_BUILDKIT=1
+	cache_args="--build-arg BUILDKIT_INLINE_CACHE=1 --cache-from type=local,src=$cache_dir --cache-to type=local,dest=$cache_dir,mode=max"
+fi
+
 docker build $cpu_set \
 	--build-arg P2POOL_VERSION=$1 \
-	--build-arg P2POOL_CHECKOUT=$checkout_ref \
+	$cache_args \
 	-t p2pool_linux_x64_build_$1 \
 	-f Dockerfile "$repo_root"
 

scripts/release/linux_x64/p2pool_linux_x64.sh

@@ -2,15 +2,22 @@
 set -e
 
 cd /p2pool
-git fetch --jobs=$(nproc)
 CHECKOUT_REF=${P2POOL_CHECKOUT:-$2}
+if [ -z "$CHECKOUT_REF" ]; then
+	echo "No checkout ref provided. Pass a version/tag as argument 2 or set P2POOL_CHECKOUT."
+	exit 1
+fi
+if ! git rev-parse --verify --quiet "$CHECKOUT_REF^{commit}" >/dev/null; then
+	echo "Requested ref '$CHECKOUT_REF' is not present in the build context."
+	exit 1
+fi
 echo "Checking out ${CHECKOUT_REF} (version label $2)"
-git checkout "$CHECKOUT_REF"
+git checkout --detach "$CHECKOUT_REF"
 git -c submodule.external/src/grpc.update=none submodule update --recursive --jobs $(nproc)
 
 export TZ=UTC0
 
-BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct "$CHECKOUT_REF")
 CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
 CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
 TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")

scripts/release/macos_aarch64/build.sh

@@ -6,7 +6,6 @@ set -eu
 cd "$(dirname "$0")"
 
 repo_root="$(cd ../../.. && pwd)"
-checkout_ref="$(git -C "$repo_root" rev-parse HEAD)"
 
 if [ "${2:-}" ]; then
 	cpu_set="--cpuset-cpus $2"
@@ -14,9 +13,17 @@ else
 	cpu_set=""
 fi
 
+cache_args=""
+if [ -n "${P2POOL_BUILD_CACHE:-}" ]; then
+	cache_dir="${P2POOL_BUILD_CACHE%/}/macos_aarch64"
+	mkdir -p "$cache_dir"
+	export DOCKER_BUILDKIT=1
+	cache_args="--build-arg BUILDKIT_INLINE_CACHE=1 --cache-from type=local,src=$cache_dir --cache-to type=local,dest=$cache_dir,mode=max"
+fi
+
 docker build $cpu_set \
 	--build-arg P2POOL_VERSION=$1 \
-	--build-arg P2POOL_CHECKOUT=$checkout_ref \
+	$cache_args \
 	-t p2pool_macos_aarch64_build_$1 \
 	-f Dockerfile "$repo_root"
 

scripts/release/macos_aarch64/p2pool_macos_aarch64.sh

@@ -2,15 +2,22 @@
 set -e
 
 cd /p2pool
-git fetch --jobs=$(nproc)
 CHECKOUT_REF=${P2POOL_CHECKOUT:-$2}
+if [ -z "$CHECKOUT_REF" ]; then
+	echo "No checkout ref provided. Pass a version/tag as argument 2 or set P2POOL_CHECKOUT."
+	exit 1
+fi
+if ! git rev-parse --verify --quiet "$CHECKOUT_REF^{commit}" >/dev/null; then
+	echo "Requested ref '$CHECKOUT_REF' is not present in the build context."
+	exit 1
+fi
 echo "Checking out ${CHECKOUT_REF} (version label $2)"
-git checkout "$CHECKOUT_REF"
+git checkout --detach "$CHECKOUT_REF"
 git -c submodule.external/src/grpc.update=none submodule update --recursive --jobs $(nproc)
 
 export TZ=UTC0
 
-BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct "$CHECKOUT_REF")
 CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
 CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
 TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")

scripts/release/windows_x64/build.sh

@@ -6,7 +6,6 @@ set -eu
 cd "$(dirname "$0")"
 
 repo_root="$(cd ../../.. && pwd)"
-checkout_ref="$(git -C "$repo_root" rev-parse HEAD)"
 
 if [ "${2:-}" ]; then
 	cpu_set="--cpuset-cpus $2"
@@ -14,9 +13,17 @@ else
 	cpu_set=""
 fi
 
+cache_args=""
+if [ -n "${P2POOL_BUILD_CACHE:-}" ]; then
+	cache_dir="${P2POOL_BUILD_CACHE%/}/windows_x64"
+	mkdir -p "$cache_dir"
+	export DOCKER_BUILDKIT=1
+	cache_args="--build-arg BUILDKIT_INLINE_CACHE=1 --cache-from type=local,src=$cache_dir --cache-to type=local,dest=$cache_dir,mode=max"
+fi
+
 docker build $cpu_set \
 	--build-arg P2POOL_VERSION=$1 \
-	--build-arg P2POOL_CHECKOUT=$checkout_ref \
+	$cache_args \
 	-t p2pool_windows_x64_build_$1 \
 	-f Dockerfile "$repo_root"
 

scripts/release/windows_x64/p2pool_windows_x64.sh

@@ -9,15 +9,22 @@ trap 'rm -rf "$PATCH_TMP_ROOT"' EXIT
 cp -r patches "$PATCH_TMP_ROOT/"
 PATCH_DIR="$PATCH_TMP_ROOT/patches"
 
-git fetch --jobs=$(nproc)
 CHECKOUT_REF=${P2POOL_CHECKOUT:-$2}
+if [ -z "$CHECKOUT_REF" ]; then
+	echo "No checkout ref provided. Pass a version/tag as argument 2 or set P2POOL_CHECKOUT."
+	exit 1
+fi
+if ! git rev-parse --verify --quiet "$CHECKOUT_REF^{commit}" >/dev/null; then
+	echo "Requested ref '$CHECKOUT_REF' is not present in the build context."
+	exit 1
+fi
 echo "Checking out ${CHECKOUT_REF} (version label $2)"
-git checkout "$CHECKOUT_REF"
+git checkout --detach "$CHECKOUT_REF"
 git -c submodule.external/src/grpc.update=none submodule update --recursive --jobs $(nproc)
 
 export TZ=UTC0
 
-BUILD_TIMESTAMP=$(git show --no-patch --format=%ct $2)
+BUILD_TIMESTAMP=$(git show --no-patch --format=%ct "$CHECKOUT_REF")
 CURRENT_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y-%m-%d")
 CURRENT_TIME=$(date -u -d @$BUILD_TIMESTAMP +"%H:%M:%S")
 TOUCH_DATE=$(date -u -d @$BUILD_TIMESTAMP +"%Y%m%d%H%M.%S")