WIP: more comments, more conditions, more cleanup

Author: jeffbcross

scripts/angular.js/untag-release.sh

@@ -13,27 +13,30 @@ ARG_DEFS=(
   "--version-number=([0-9]+\.[0-9]+\.[0-9]+(-[a-z]+\.[0-9]+)?)"
 )
 
-function checkVersionNumber() {
-  BRANCH_PATTERN=$(readJsonProp "package.json" "branchVersion")
-  if [[ $VERSION_NUMBER != $BRANCH_PATTERN ]]; then
-    echo "version-number needs to match $BRANCH_PATTERN on this branch"
-    usage
-  fi
-}
-
 function init {
-  cd ../..
-  checkVersionNumber
+  TMP_DIR=$(resolveDir ../../tmp)
   TAG_NAME="v$VERSION_NUMBER"
 }
 
 function prepare() {
-  #no-op since publish does everything
+  tags=`git ls-remote --tags git@github.com:angular/angular.js`
+  if [[ $tags =~ "refs/tags/v$VERSION_NUMBER^" ]]; then
+    echo "-- Creating dummy git repo for angular.js with origin remote"
+    mkdir $TMP_DIR/empty-angular.js
+    cd $TMP_DIR/empty-angular.js
+    git init
+    git remote add origin git@github.com:angular/angular.js.git
+  else
+    echo "-- Tag v$VERSION_NUMBER does not exist on remote. Moving on"
+  fi
 }
 
 function publish() {
   # push the tag deletion to github
-  git push origin ":$TAG_NAME"
+  if [ -d "$TMP_DIR/empty-angular.js" ]; then
+    cd $TMP_DIR/empty-angular.js
+    git push origin ":$TAG_NAME"
+  fi
 }
 
 source $(dirname $0)/../utils.inc

scripts/bower/unpublish.sh

@@ -13,7 +13,6 @@ ARG_DEFS=(
 
 function init {
   TMP_DIR=$(resolveDir ../../tmp)
-  BUILD_DIR=$(resolveDir ../../build)
   REPOS=(
     angular
     angular-animate
@@ -30,26 +29,19 @@ function init {
 }
 
 function prepare {
-  #
-  # clone repos
-  #
   for repo in "${REPOS[@]}"
   do
-    echo "-- Cloning bower-$repo"
-    git clone git@github.com:angular/bower-$repo.git $TMP_DIR/bower-$repo
-  done
+    tags=`git ls-remote --tags git@github.com:angular/bower-$repo`
+    if [[ $tags =~ "refs/tags/v$VERSION_NUMBER" ]]; then
+      echo "-- Creating dummy git repo for bower-$repo with origin remote"
+      mkdir $TMP_DIR/bower-$repo
+      cd $TMP_DIR/bower-$repo
+      git init
+      git remote add origin git@github.com:angular/bower-$repo.git
+    else
+      echo "-- No remote tag matching v$VERSION_NUMBER exists on bower-$repo"
+    fi
 
-  #
-  # update bower.json
-  # delete tag in each repo
-  #
-  for repo in "${REPOS[@]}"
-  do
-    echo "-- Creating dummy git repo for bower-$repo with origin remote"
-    mkdir $TMP_DIR/bower-$repo
-    cd $TMP_DIR/bower-$repo
-    git init
-    git remote add origin git@github.com:angular/bower-$repo.git
 
     cd $SCRIPT_DIR
   done
@@ -58,10 +50,14 @@ function prepare {
 function publish {
   for repo in "${REPOS[@]}"
   do
-    echo "-- Pushing bower-$repo"
-    cd $TMP_DIR/bower-$repo
-    git push origin :v$VERSION_NUMBER
-    cd $SCRIPT_DIR
+    if [ -d "$TMP_DIR/bower-$repo" ]; then
+      echo "-- Deleting v$VERSION_NUMBER tag from bower-$repo"
+      cd $TMP_DIR/bower-$repo
+      git push origin :v$VERSION_NUMBER
+      cd $SCRIPT_DIR
+    else
+      echo "-- No directory exists for this bower-$repo (presumably because no remote tag)"
+    fi
   done
 }
 

scripts/code.angularjs.org/unpublish.sh

@@ -13,8 +13,8 @@ ARG_DEFS=(
 
 function init {
   TMP_DIR=$(resolveDir ../../tmp)
-  BUILD_DIR=$(resolveDir ../../build)
   REPO_DIR=$TMP_DIR/code.angularjs.org
+  echo "code tmp $TMP_DIR"
 }
 
 function prepare {
@@ -26,26 +26,20 @@ function prepare {
   #
   echo "-- Removing $VERSION_NUMBER from code.angularjs.org"
   cd $REPO_DIR
-  git rm -r $VERSION_NUMBER
-
-  echo "-- Committing removal to code.angularjs.org"
-  git commit -m "removing v$VERSION_NUMBER"
+  if [ -d "$VERSION_NUMBER" ]; then
+    git rm -r $VERSION_NUMBER
+    echo "-- Committing removal to code.angularjs.org"
+    git commit -m "removing v$VERSION_NUMBER"
+  else
+    echo "-- Version: $VERSION_NUMBER does not exist in code.angularjs.org!"
+  fi
 }
 
-function _update_code() {
+function publish {
   cd $REPO_DIR
 
   echo "-- Pushing code.angularjs.org to github"
   git push origin master
-
-
-  echo "-- Propagating update to server code.angularjs.org"
-  curl https://code.angularjs.org/gitFetchSite.php
-
-}
-
-function publish {
-  _update_code
 }
 
 source $(dirname $0)/../utils.inc

scripts/jenkins/undo-release.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# tags the current commit as a release and publishes all artifacts to
-# the different repositories.
-# Note: This will also works if the commit is in the past!
-
 echo "#################################"
 echo "#### undo a release  ############"
 echo "#################################"