From 525819291e13eb4b11954d6347ca296eaac13c2c Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 22 Jul 2022 15:35:31 +0200 Subject: [PATCH] check-tools --- packaging/.gitignore | 3 ++- packaging/Makefile | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/packaging/.gitignore b/packaging/.gitignore index ae07daf..b224587 100644 --- a/packaging/.gitignore +++ b/packaging/.gitignore @@ -1,5 +1,6 @@ .build-image.* +.versions distfiles/ -target/ synit-apk-key synit-apk-key.pub +target/ diff --git a/packaging/Makefile b/packaging/Makefile index a1a8c90..ae50b52 100644 --- a/packaging/Makefile +++ b/packaging/Makefile @@ -1,6 +1,6 @@ __ignored__ := $(shell ./copy-local-resources-into-package-folders.sh) -.PHONY: build-image build sign clean veryclean keyfile +.PHONY: check-tools build-image build sign clean veryclean keyfile # If you run: # docker run --rm --name squid adricu/alpine-squid @@ -61,7 +61,7 @@ clean: veryclean: clean rm -rf target -build-image: .build-image.$(ARCH) +build-image: check-tools .build-image.$(ARCH) .build-image.$(ARCH): $(KEYFILE) docker buildx build \ @@ -88,3 +88,15 @@ $(KEYFILE): -v `pwd`:/data \ alpine \ sh -c "apk add abuild && echo /data/$(KEYFILE) | abuild-keygen && chown $(UID):$(GID) /data/$(KEYFILE)*" + +check-tools: + @rm -f .versions + @preserves-tool --version >> .versions + @git --version >> .versions + @ssh -V >> .versions 2>&1 + @rsync --version | head -1 >> .versions + @python3 --version >> .versions + @rustc --version >> .versions + @cargo --version >> .versions + @make --version | head -1 >> .versions + @docker --version >> .versions