diff --git a/Makefile b/Makefile index e5e5be5d2..72fd7cd02 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,12 @@ NAME = Talos CLOUD_IMAGES_EXTRA_ARGS ?= "" ZSTD_COMPRESSION_LEVEL ?= 18 -CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$/\1/; t; Q") +CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | $(SED) -r "/^release\(.*\)/ s/^release\((.*)\):.*$/\1/; t; Q") ARTIFACTS := _out +SED ?= sed + DEBUG_TOOLS_SOURCE := scratch EMBED_TARGET ?= embed @@ -122,7 +124,7 @@ TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION ?= 2.0.0 # renovate: datasource=docker depName=hugomods/hugo HUGO_VERSION ?= dart-sass-0.145.0 OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]") -ARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/') +ARCH := $(shell uname -m | $(SED) 's/x86_64/amd64/' | $(SED) 's/aarch64/arm64/') TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM) TALOSCTL_EXECUTABLE := $(PWD)/$(ARTIFACTS)/$(TALOSCTL_DEFAULT_TARGET)-$(ARCH) INTEGRATION_TEST := integration-test @@ -371,7 +373,7 @@ docker-%: ## Builds the specified target defined in the Dockerfile using the doc @$(MAKE) target-$* TARGET_ARGS="--output type=docker,dest=$(DEST)/$*.tar,name=$(REGISTRY_AND_USERNAME)/$*:$(IMAGE_TAG_OUT) $(TARGET_ARGS)" registry-%: ## Builds the specified target defined in the Dockerfile using the image/registry output type. The build result will be pushed to the registry if PUSH=true. - @$(MAKE) target-$* TARGET_ARGS="--output type=image,name=$(REGISTRY_AND_USERNAME)/$*:$(IMAGE_TAG_OUT),rewrite-timestamp=true $(TARGET_ARGS)" + @$(MAKE) target-$* TARGET_ARGS="--output type=image,name=$(REGISTRY_AND_USERNAME)/$*:$(IMAGE_TAG_OUT),rewrite-timestamp=false $(TARGET_ARGS)" hack-test-%: ## Runs the specified script in ./hack/test with well known environment variables. @./hack/test/$*.sh @@ -739,7 +741,7 @@ reproducibility-test-docker-%: $(ARTIFACTS) @mkdir -p _out1/ _out2/ @$(MAKE) docker-$* DEST=_out1/ @$(MAKE) docker-$* DEST=_out2/ TARGET_ARGS="--no-cache" - @find _out1/ -type f | xargs -IFILE diffoscope FILE `echo FILE | sed 's/_out1/_out2/'` + @find _out1/ -type f | xargs -IFILE diffoscope FILE `echo FILE | $(SED) 's/_out1/_out2/'` @rm -rf _out1/ _out2/ reproducibility-test-local-%: $(ARTIFACTS) @@ -747,7 +749,7 @@ reproducibility-test-local-%: $(ARTIFACTS) @mkdir -p _out1/ _out2/ @$(MAKE) local-$* DEST=_out1/ @$(MAKE) local-$* DEST=_out2/ TARGET_ARGS="--no-cache" - @find _out1/ -type f | xargs -IFILE diffoscope FILE `echo FILE | sed 's/_out1/_out2/'` + @find _out1/ -type f | xargs -IFILE diffoscope FILE `echo FILE | $(SED) 's/_out1/_out2/'` @rm -rf _out1/ _out2/ reproducibility-test-iso: $(ARTIFACTS)