From 660fdaacd267bf47b95302199f7ccfbc129018ee Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Fri, 10 Jan 2025 23:13:17 -0800 Subject: [PATCH 1/2] Trigger calico/go-build auto pin update on successful tag builds This changeset changes auto `calico/go-build` pin update to trigger only on successful tag builds. SEMAPHORE_WORKFLOW_BRANCH is also set to the master branch by default. Currently, it is always set to SEMAPHORE_GIT_BRANCH which isn't correct for tag builds. --- .semaphore/promotions/calico-go-build.yml | 2 +- Makefile.common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/promotions/calico-go-build.yml b/.semaphore/promotions/calico-go-build.yml index 952d6de9..6f76130d 100644 --- a/.semaphore/promotions/calico-go-build.yml +++ b/.semaphore/promotions/calico-go-build.yml @@ -42,7 +42,7 @@ blocks: dependencies: - Publish calico/go-build images run: - when: "branch = 'master' OR tag =~ '^1\\.\\d+\\.\\d-llvm\\d+\\.\\d\\.\\d-k8s1\\.\\d+\\.\\d'" + when: tag =~ '^1\\.\\d+\\.\\d-llvm\\d+\\.\\d\\.\\d-k8s1\\.\\d+\\.\\d'" task: secrets: - name: semaphore-api diff --git a/Makefile.common b/Makefile.common index b58b4449..c0138586 100644 --- a/Makefile.common +++ b/Makefile.common @@ -692,7 +692,7 @@ semaphore-run-auto-pin-update-workflow: # SEMAPHORE_AUTO_PIN_UPDATE_PROJECT_IDS. semaphore-run-auto-pin-update-workflows: for ID in $(SEMAPHORE_AUTO_PIN_UPDATE_PROJECT_IDS); do\ - SEMAPHORE_WORKFLOW_BRANCH=$(SEMAPHORE_GIT_BRANCH) SEMAPHORE_PROJECT_ID=$$ID $(MAKE) semaphore-run-auto-pin-update-workflow; \ + SEMAPHORE_PROJECT_ID=$$ID $(MAKE) semaphore-run-auto-pin-update-workflow; \ done ############################################################################### From 37e1de6c4982c9f99ee589c60d1f155fbab121b8 Mon Sep 17 00:00:00 2001 From: Jiawei Huang Date: Mon, 13 Jan 2025 15:26:58 -0800 Subject: [PATCH 2/2] Fix calico go-build promotion regex --- .semaphore/promotions/calico-go-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/promotions/calico-go-build.yml b/.semaphore/promotions/calico-go-build.yml index 6f76130d..dc7318d2 100644 --- a/.semaphore/promotions/calico-go-build.yml +++ b/.semaphore/promotions/calico-go-build.yml @@ -42,7 +42,7 @@ blocks: dependencies: - Publish calico/go-build images run: - when: tag =~ '^1\\.\\d+\\.\\d-llvm\\d+\\.\\d\\.\\d-k8s1\\.\\d+\\.\\d'" + when: "tag =~ '^1\\.\\d+\\.\\d-llvm\\d+\\.\\d\\.\\d-k8s1\\.\\d+\\.\\d'" task: secrets: - name: semaphore-api