Pass branch name to push-tags script, filter tags for the current release branch

Author: webflo

push-tags

@@ -1,6 +1,12 @@
 #!/usr/bin/env php
 <?php
 
+if (empty($GLOBALS['argv']['1'])) {
+  throw new Exception("Invalid branch name");
+}
+
+list($major, $minor) = explode('.', $GLOBALS['argv']['1']);
+
 define('UPSTREAM_REPOSITORY', 'https://git.drupal.org/project/drupal.git');
 define('UPSTREAM_DIRECTORY', 'upstream');
 define('DOWNSTREAM_REPOSITORY', exec('git config --get remote.origin.url'));
@@ -18,19 +24,19 @@ $blacklist = array(
   '8.0.0-beta5',
 );
 
-function filter_valid_tags($upstream_tags, $blacklist) {
+function filter_valid_tags($upstream_tags, $blacklist, $major, $minor) {
   $tags = array();
   foreach ($upstream_tags as $tag) {
-    preg_match('/refs\/tags\/(8\.[0-9]+\.[0-9]+[^\^\{}\n]*)/', $tag, $value);
+    preg_match('/refs\/tags\/(' . $major . '\.' . $minor . '\.[0-9]+[^\^\{}\n]*)/', $tag, $value);
     if (isset($value[1]) && !in_array($value[1], $blacklist)) {
       $tags[] = $value[1];
     }
   }
   return array_unique($tags);
 }
 
-$upstream_tags = filter_valid_tags($upstream_tags, $blacklist);
-$downstream_tags = filter_valid_tags($downstream_tags, $blacklist);
+$upstream_tags = filter_valid_tags($upstream_tags, $blacklist, $major, $minor);
+$downstream_tags = filter_valid_tags($downstream_tags, $blacklist, $major, $minor);
 
 // Tags thats are not in the downstream repo.
 $tags = array_diff($upstream_tags, $downstream_tags);

update.bash

@@ -11,7 +11,7 @@ function update_subtree_split {
   git clean -fd
   cd $BASEDIR
   ./subtree-split push branch $1
-  ./push-tags
+  ./push-tags $1
   rm -rf ./upstream/.git/subtree-cache
 }