Properly handle tags for release builds

yarnpkg · Dec 2, 2016 · d6e26fe · d6e26fe
1 parent 44842e4
commit d6e26fe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/nightly/lib/AppVeyor.php b/nightly/lib/AppVeyor.php
@@ -56,7 +56,10 @@ public static function getArtifactsForJob($job_id) {
 
   public static function validateBuild($build, $project) {
     if (
-      ($build->branch !== Config::BRANCH && !Str::endsWith($build->branch, Config::RELEASE_BRANCH_SUFFIX)) ||
+      (
+        $build->branch !== Config::BRANCH &&
+        !preg_match(Config::RELEASE_TAG_FORMAT, $build->branch)
+      ) ||
       $project->repositoryName !== Config::ORG_NAME.'/'.Config::REPO_NAME
     ) {
       api_response(sprintf(

diff --git a/nightly/lib/config.php b/nightly/lib/config.php
@@ -5,7 +5,7 @@ class Config {
   const ORG_NAME = 'yarnpkg';
   const REPO_NAME = 'yarn';
   const BRANCH = 'master';
-  const RELEASE_BRANCH_SUFFIX = '-stable';
+  const RELEASE_TAG_FORMAT = '/v[0-9]+(\.[0-9]+)*/';
 
   const SIGN_AUTH_TOKEN = 'CHANGEME';
   const GITHUB_TOKEN = 'CHANGEME';