From e228a2c87e8e2426c05911d3f10af75de4aad69e Mon Sep 17 00:00:00 2001 From: Gene Wood Date: Mon, 1 Apr 2019 16:42:31 -0700 Subject: [PATCH] Fix regex in deploy to match multi digit semver versions --- CHANGELOG | 7 ++++++- cloudy_mozdef/ci/deploy | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b85650a5..c316effb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## [Unreleased] +## [v1.38.3] - 2019-04-01 +### Fixed +- AWS CodeBuild tag semver regex + ## [v1.38.2] - 2019-03-29 ### Fixed - Remaining references to old alertplugins container @@ -47,7 +51,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Added checks on sending SQS messages to only accept intra-account messages - Improved docker performance and disk space requirements -[Unreleased]: https://github.com/mozilla/MozDef/compare/v1.38.2...HEAD +[Unreleased]: https://github.com/mozilla/MozDef/compare/v1.38.3...HEAD +[v1.38.3]: https://github.com/mozilla/MozDef/compare/v1.38.2...v1.38.3 [v1.38.2]: https://github.com/mozilla/MozDef/compare/v1.38.1...v1.38.2 [v1.38.1]: https://github.com/mozilla/MozDef/compare/v1.38...v1.38.1 [v1.38]: https://github.com/mozilla/MozDef/compare/v1.37...v1.38 diff --git a/cloudy_mozdef/ci/deploy b/cloudy_mozdef/ci/deploy index 3066a8ca..a5a2e347 100644 --- a/cloudy_mozdef/ci/deploy +++ b/cloudy_mozdef/ci/deploy @@ -18,7 +18,7 @@ echo "It's dangerous to go alone. Take one of these: <%%%%|==========>" echo "Processing webhook event for ${CODEBUILD_WEBHOOK_TRIGGER}." if [[ "branch/master" == "$CODEBUILD_WEBHOOK_TRIGGER" \ - || "$CODEBUILD_WEBHOOK_TRIGGER" =~ ^tag\/v[0-9]\.[0-9]\.[0-9](\-(prod|pre|testing))?$ ]]; then + || "$CODEBUILD_WEBHOOK_TRIGGER" =~ ^tag\/v[0-9]+\.[0-9]+\.[0-9]+(\-(prod|pre|testing))?$ ]]; then echo "Building a release" echo "C|_| This may take a bit. Might as well grab a coffee." make build-from-cwd