From 7156695c5f4f6d4d395b66408fb86818da4b8404 Mon Sep 17 00:00:00 2001 From: okkspartak00 <143729938+okkspartak00@users.noreply.github.com> Date: Mon, 26 May 2025 16:32:07 +0200 Subject: [PATCH 1/4] Update README.md --- guard/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guard/README.md b/guard/README.md index f45bde127..b3b2a51e2 100644 --- a/guard/README.md +++ b/guard/README.md @@ -1,5 +1,5 @@ # Guard - +test Service for handling user authentication, user lifecycle management, organizations and git aplication configuration. ### Development From b845d4c80a65cd1873d4867e577aaffa3f3a286f Mon Sep 17 00:00:00 2001 From: okkspartak00 <143729938+okkspartak00@users.noreply.github.com> Date: Mon, 26 May 2025 17:24:19 +0200 Subject: [PATCH 2/4] Update semaphore.yml --- .semaphore/semaphore.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 923024443..b16eaee25 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -815,6 +815,10 @@ blocks: jobs: - name: "\U0001F5BC️ Build test image" commands: + - git status + - git branch + - git rev-parse --abbrev-ref HEAD | sed 's/[^a-z]//g' | cut -c 1-40 + - git rev-parse - make build - make push - name: "Guard: \U0001F4CB Provision Prod Image" From 4f79043a90b6b94997cc3d0440a41217e41d7828 Mon Sep 17 00:00:00 2001 From: okkspartak00 <143729938+okkspartak00@users.noreply.github.com> Date: Tue, 27 May 2025 11:41:53 +0200 Subject: [PATCH 3/4] Update Makefile --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index c1b9ebaa1..3e2c15916 100644 --- a/Makefile +++ b/Makefile @@ -7,10 +7,13 @@ TAG_NAME=$(shell git describe --exact-match --tags HEAD 2>/dev/null) # ifneq ($(TAG_NAME),) export BRANCH?=$(shell git branch --contains tags/$(TAG_NAME) | head -n 1 | sed '/HEAD/d' | sed 's/[^a-z]//g' | cut -c 1-40) +else ifneq ($(SEMAPHORE_GIT_PR_NUMBER),) + export BRANCH?=pr$(SEMAPHORE_GIT_PR_NUMBER) else export BRANCH?=$(shell git rev-parse --abbrev-ref HEAD | sed 's/[^a-z]//g' | cut -c 1-40) endif + export REGISTRY_HOST?=local export IMAGE?=$(APP_NAME)/$(BRANCH) export MAIN_IMAGE?=$(APP_NAME)/main From e51681d0af6aca6d02608f552d395f172f68b45f Mon Sep 17 00:00:00 2001 From: okkspartak00 <143729938+okkspartak00@users.noreply.github.com> Date: Tue, 27 May 2025 11:42:47 +0200 Subject: [PATCH 4/4] Update semaphore.yml --- .semaphore/semaphore.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index b16eaee25..13e131006 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -816,6 +816,7 @@ blocks: - name: "\U0001F5BC️ Build test image" commands: - git status + - echo $SEMAPHORE_GIT_PR_NUMBER - git branch - git rev-parse --abbrev-ref HEAD | sed 's/[^a-z]//g' | cut -c 1-40 - git rev-parse