From 38a6113faa064e9fd87a468880ed54a67440ed0e Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Wed, 24 May 2023 16:10:12 +0000 Subject: [PATCH] Squashed '.ci/' changes from 63421d1..79eebe4 79eebe4 add ARCH support for tests aea1ccc Only add branch name to tags, if not part of actual tag a5875db Make EXTRA_TAGS work again git-subtree-dir: .ci git-subtree-split: 79eebe4d3de843d921994db20e20dda801272934 --- podman.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/podman.mk b/podman.mk index 2ab4469..3554fd3 100644 --- a/podman.mk +++ b/podman.mk @@ -2,17 +2,18 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) GIT_TAG := $(shell git describe --tags --match v*.*.* 2>/dev/null || git rev-parse --short HEAD 2>/dev/null) -# append branch name to tag if NOT main nor master TAG := $(GIT_TAG) +# append branch name to tag if NOT main nor master ifeq (,$(filter main master, $(GIT_BRANCH))) - ifneq ($(GIT_TAG), $(GIT_BRANCH)) - TAG = $(GIT_TAG)-$(GIT_BRANCH) + # If branch is substring of tag, omit branch name + ifeq ($(findstring $(GIT_BRANCH), $(GIT_TAG)),) + # only append branch name if not equal tag + ifneq ($(GIT_TAG), $(GIT_BRANCH)) + TAG = $(GIT_TAG)-$(GIT_BRANCH) + endif endif endif -# optionally set by the caller -EXTRA_TAGS := - ARCH := amd64 ALL_ARCHS := amd64 arm64 _ARCH = $(or $(filter $(ARCH),$(ALL_ARCHS)),$(error $$ARCH [$(ARCH)] must be exactly one of "$(ALL_ARCHS)")) @@ -36,7 +37,7 @@ build: ## Build the app test: rm-test-image ## Execute Dockerfile.test test -f Dockerfile.test && \ - { buildah build --rm --layers -t $(REGISTRY)/$(IMAGE):$(TAG)-test --from=$(REGISTRY)/$(IMAGE):$(TAG) -f Dockerfile.test --platform linux/$(_ARCH) . && \ + { buildah build --rm --layers -t $(REGISTRY)/$(IMAGE):$(TAG)-$(_ARCH)-test --from=$(REGISTRY)/$(IMAGE):$(TAG) -f Dockerfile.test --platform linux/$(_ARCH) . && \ podman run --rm --env-host -t $(REGISTRY)/$(IMAGE):$(TAG)-$(_ARCH)-test; } || \ echo "No Dockerfile.test found, skipping test"