chore(travis): include scss in ionic-bower, ionic.cdnbundle.js, misc

This commit is contained in:
Andy Joslin
2014-02-10 11:50:21 -05:00
parent 4a13a0c782
commit e8605b58fe
4 changed files with 18 additions and 10 deletions

View File

@@ -14,7 +14,7 @@ function init {
BUILD_DIR=$SCRIPT_DIR/../../dist
PROJECT_DIR=$SCRIPT_DIR/../..
BOWER_DIR=$TMP_DIR/bower-ionic
BOWER_DIR=$TMP_DIR/ionic-bower
}
function run {
@@ -25,14 +25,15 @@ function run {
rm -rf $BOWER_DIR
mkdir -p $BOWER_DIR
echo "-- Cloning bower-ionic..."
git clone https://$GH_ORG:$GH_TOKEN@github.com/$GH_ORG/bower-ionic.git $BOWER_DIR
echo "-- Cloning ionic-bower..."
git clone https://$GH_ORG:$GH_TOKEN@github.com/$GH_ORG/ionic-bower.git $BOWER_DIR
# move the files from the build
echo "-- Putting build files in bower-ionic..."
echo "-- Putting build files in ionic-bower..."
cd $BOWER_DIR
cp -Rf $BUILD_DIR/* $BOWER_DIR
cp -Rf $PROJECT_DIR/scss $BOWER_DIR
# Angular dependencies are managed by bower, don't include them
rm -rf $BOWER_DIR/js/angular*
@@ -40,23 +41,23 @@ function run {
# update bower.json
# tag each repo
echo "-- Updating version in bower-ionic to $VERSION"
echo "-- Updating version in ionic-bower to $VERSION"
replaceJsonProp "bower.json" "version" "$VERSION"
echo "-- Updating codename in bower-ionic to $CODENAME"
echo "-- Updating codename in ionic-bower to $CODENAME"
replaceJsonProp "bower.json" "codename" "$CODENAME"
echo "-- Committing and tagging bower-ionic"
echo "-- Committing and tagging ionic-bower"
git add -A
git commit -m "release: v$VERSION"
git tag v$VERSION
echo "-- Pushing bower-ionic"
echo "-- Pushing ionic-bower"
cd $BOWER_DIR
git push -q --tags origin master
echo "-- Published bower-ionic to v$VERSION successfully!"
echo "-- Published ionic-bower to v$VERSION successfully!"
# Go back to the script to make things 'safe'
cd $SCRIPT_DIR

View File

@@ -33,6 +33,13 @@ function run {
cd $VERSION_DIR
cp -R $BUILD_DIR/* $VERSION_DIR
cd $VERSION_DIR/js
cat angular/angular.js \
angular/angular-animate.js \
angular-ui/angular-ui-router.js \
ionic.js \
ionic-angular.js > ionic.cdnbundle.js
echo "-- Generating versions.json..."
cd $IONIC_CODE_DIR/builder
python ./generate.py > /dev/null

View File

@@ -66,6 +66,7 @@ function run {
# Build (make sure to build after version is bumped)
grunt build
grunt removelogging
# Version label used on the CDN: nightly or the version name
if [[ $IS_RELEASE == "true" ]]; then