WIP: make changes based on feedback

Author: jeffbcross

scripts/angular.js/untag-release.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# Tags a release
-# so that travis can do the actual release.
+# Untags a release.
 
 echo "###################################"
 echo "## Untag angular.js for a release #"
@@ -29,12 +28,12 @@ function init {
 }
 
 function prepare() {
-  git tag -d "$TAG_NAME"
+  #no-op since publish does everything
 }
 
 function publish() {
   # push the tag deletion to github
-  git push origin ":refs/tags/$TAG_NAME"
+  git push origin ":$TAG_NAME"
 }
 
 source $(dirname $0)/../utils.inc

scripts/bower/unpublish.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Script for updating the Angular bower repos from current local build.
+# Script for removing tags from the Angular bower repos
 
 echo "#################################"
 echo "#### Untag bower ################"
@@ -29,9 +29,6 @@ function init {
   )
 }
 
-
-
-
 function prepare {
   #
   # clone repos
@@ -44,15 +41,16 @@ function prepare {
 
   #
   # update bower.json
-  # tag each repo
+  # delete tag in each repo
   #
   for repo in "${REPOS[@]}"
   do
-    echo "-- Removing $NEW_VERSION tag from bower-$repo"
+    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
 
-    echo "-- Deleting tag v$VERSION_NUMBER in bower-$repo"
-    git tag -d v$VERSION_NUMBER
     cd $SCRIPT_DIR
   done
 }
@@ -62,7 +60,7 @@ function publish {
   do
     echo "-- Pushing bower-$repo"
     cd $TMP_DIR/bower-$repo
-    git push origin v$NEW_VERSION
+    git push origin :v$VERSION_NUMBER
     cd $SCRIPT_DIR
   done
 }

scripts/code.angularjs.org/unpublish.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-# Script for updating code.angularjs.org repo from current local build.
+# Script for removing specified release dir from code.angularjs.org.
 
-echo "#################################"
-echo "## Update code.angular.js.org ###"
-echo "#################################"
+echo "################################################"
+echo "## Remove a version from code.angular.js.org ###"
+echo "################################################"
 
 ARG_DEFS=(
   "--action=(prepare|publish)"
@@ -22,27 +22,24 @@ function prepare {
   git clone git@github.com:angular/code.angularjs.org.git $REPO_DIR
 
   #
-  # copy the files from the build
+  # Remove the files from the repo
   #
   echo "-- Removing $VERSION_NUMBER from code.angularjs.org"
   cd $REPO_DIR
   git rm -r $VERSION_NUMBER
 
-  #
-  # commit
-  #
-  echo "-- Committing code.angularjs.org"
+  echo "-- Committing removal to code.angularjs.org"
   git commit -m "removing v$VERSION_NUMBER"
 }
 
 function _update_code() {
   cd $REPO_DIR
 
-  echo "-- Pushing code.angularjs.org"
+  echo "-- Pushing code.angularjs.org to github"
   git push origin master
 
 
-  echo "-- Refreshing code.angularjs.org: backend=$backend"
+  echo "-- Propagating update to server code.angularjs.org"
   curl https://code.angularjs.org/gitFetchSite.php
 
 }

scripts/jenkins/undo-release.sh

@@ -42,8 +42,4 @@ function run {
   phase publish
 }
 
-echo $VERSION_NUMBER
-# Will need to change the angular.js CHANGELOG.md manually
-git tag -d $VERSION_NUMBER
-
 source $(dirname $0)/../utils.inc