diff --git a/gulpfile.js b/gulpfile.js index 23f8625982..905f1a4ea3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -10,7 +10,6 @@ var through = require('through'); var argv = require('minimist')(process.argv.slice(2)); -var bump = require('gulp-bump'); var concat = require('gulp-concat'); var gulpif = require('gulp-if'); var header = require('gulp-header'); diff --git a/package.json b/package.json index 2de3251bb7..3071a7c17a 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "sauce-connect-launcher": "^0.2.2", "dgeni": "^0.2.0", "dgeni-packages": "ajoslin/dgeni-packages#nunjucks-config", - "gulp-bump": "^0.1.6", "jshint-stylish": "^0.1.5", "gulp-template": "^0.1.1", "gulp-concat": "^2.1.7", diff --git a/scripts/site/publish.sh b/scripts/site/publish.sh index b2c5111be4..515e5f4d35 100755 --- a/scripts/site/publish.sh +++ b/scripts/site/publish.sh @@ -1,8 +1,4 @@ -echo "#################################" -echo "#### Update Site #################" -echo "#################################" - ARG_DEFS=( "[--version-name=(.*)]" "--action=(clone|updateConfig|docs)" @@ -16,10 +12,13 @@ function init { } function clone { + echo "#################################" + echo "## Cloning ionic-site repo.... ##" + echo "#################################" + rm -rf $IONIC_SITE_DIR mkdir -p $IONIC_SITE_DIR - echo "-- Cloning ionic-site..." git clone https://$GH_ORG:$GH_TOKEN@github.com/$GH_ORG/ionic-site.git \ $IONIC_SITE_DIR \ --depth=10 \ @@ -27,6 +26,10 @@ function clone { } function updateConfig { + echo "#####################################" + echo "## Cloning ionic-site config.yml... #" + echo "#####################################" + VERSION=$(readJsonProp "$BUILD_DIR/version.json" "version") CODENAME=$(readJsonProp "$BUILD_DIR/version.json" "codename") DATE=$(readJsonProp "$BUILD_DIR/version.json" "date") @@ -47,7 +50,9 @@ function updateConfig { # Example: ./scripts/site/publish.sh --action=docs --version-name=nightly function docs { - echo "-- Docs Update" + echo "#####################################" + echo "## Updating docs for $VERSION_NAME ##" + echo "#####################################" # cd $PROJECT_DIR # gulp docs @@ -56,14 +61,14 @@ function docs { # CHANGES=$(git status --porcelain) # # if no changes, don't commit - # if [[ "$CHANGES" != "" ]]; then + # if [[ "$CHANGES" == "" ]]; then + # echo "-- No changes detected in docs for $VERSION_NAME; docs not updated." + # else # git add -A # git commit -am "docs: update for $VERSION_NAME" # git push -q origin gh-pages # echo "-- Updated docs for $VERSION_NAME succesfully!" - # else - # echo "-- No changes detected in docs for $VERSION_NAME; docs not updated." # fi } diff --git a/scripts/travis/bump-nightly-version.sh b/scripts/travis/bump-nightly-version.sh index 160c29cc58..5590534bfa 100755 --- a/scripts/travis/bump-nightly-version.sh +++ b/scripts/travis/bump-nightly-version.sh @@ -12,7 +12,7 @@ function run { VERSION=$(readJsonProp "package.json" "version") - NEW_VERSION="$VERSION-$TRAVIS_BUILD_NUMBER" + NEW_VERSION="$VERSION-nightly-$TRAVIS_BUILD_NUMBER" replaceJsonProp "package.json" "version" "$NEW_VERSION"