From 81fface8b6556468270072ab413b58c5d0cf45e4 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Wed, 19 Mar 2025 14:17:32 +0100 Subject: [PATCH] buildkite: support for npcap or urgency releases (#556) (cherry picked from commit 1c7fba12b52c4ec236ffbfb507d94db2be38e59f) --- .buildkite/pipeline.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 68af7b33..986859cf 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -80,7 +80,8 @@ steps: - ".buildkite/scripts/publish.sh {{matrix.makefile}}" env: FIPS: "{{matrix.fips}}" - if: build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/ + # Releases should only be for main for ^[0-9].[0-9] branches (therefore support for major.minor.patch.x too). + if: build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+/ || build.branch =~ /^[0-9]+\.[0-9]+\.[0-9]+\.x$$/ agents: provider: "gcp" image: "${IMAGE_UBUNTU_X86_64}" @@ -107,7 +108,8 @@ steps: - ".buildkite/scripts/publish.sh {{matrix.makefile}}" env: FIPS: "{{matrix.fips}}" - if: build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/ + # Releases should only be for main for ^[0-9].[0-9] branches (therefore support for major.minor.patch.x too). + if: build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/ || build.branch =~ /^[0-9]+\.[0-9]+\.[0-9]+\.x$$/ agents: provider: "aws" imagePrefix: "${IMAGE_UBUNTU_ARM_64}" @@ -129,6 +131,7 @@ steps: - label: "Post-Release" key: "release-post" command: ".buildkite/scripts/post-release.sh ${GOLANG_VERSION}" + # Releases should only be for main for ^[0-9].[0-9]$ branches. if: build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/ depends_on: - "release-ubuntu-x86"