Skip to content

Commit

Permalink
Fix release branch pin update regex (add ^ to start) and cascade pin …
Browse files Browse the repository at this point in the history
…updates
  • Loading branch information
Brian-McM committed Nov 4, 2020
1 parent 0195054 commit 1208d34
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
14 changes: 13 additions & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ promotions:
# If the block has passed and the branch is for master or a release branch then run the pin updates. Note that
# this doesn't try to restrict which release branches, as the presence of this auto promotion code means that
# it can handle updating the pins in this fashion.
when: "(result = 'passed') and ((branch = 'master') or (branch =~ 'release-v\d*\.\d*'))"
when: "(result = 'passed') and ((branch = 'master') or (branch =~ '^release-v\d*\.\d*'))"

global_job_config:
secrets:
Expand Down Expand Up @@ -145,3 +145,15 @@ blocks:
- name: CI excluding FV
commands:
- make ci EXCEPT=fv
- name: Trigger pin updates
dependencies: []
skip:
when: "(branch != 'master') and (branch !~ '^release-v\d*\.\d*')"
task:
secrets:
- name: semaphore-api
jobs:
- name: Trigger pin updates
commands:
- checkout
- make semaphore-run-auto-pin-update-workflows
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#
###############################################################################
PACKAGE_NAME?=github.com/projectcalico/felix
GO_BUILD_VER?=v0.48
GO_BUILD_VER?=v0.49

SEMAPHORE_PROJECT_ID?=$(SEMAPHORE_FELIX_PROJECT_ID)

Expand Down

0 comments on commit 1208d34

Please sign in to comment.