diff --git a/README.md b/README.md index 1a7919f87d2..7b88d3c93c9 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ $ ionic start myproject * The `release` folder of this repository * Ionic CDN: [Latest Release](http://code.ionicframework.com/) * Using bower: `bower install ionic` - * For [Meteor](https://www.meteor.com/) applications: `meteor add driftyco:ionic` + * For [Meteor](https://www.meteor.com/) applications: `meteor add driftyco:ionic` - Download the **bleeding edge just-from-master release** from: * Ionic CDN: [Nightly Build](http://code.ionicframework.com/#nightly) * Using bower: `bower install driftyco/ionic-bower#master` @@ -84,11 +84,11 @@ Originally created by [Adam Bradley](http://twitter.com/adamdbradley), [Ben Sper ### Documentation -* Documentation is generated into `dist/ionic-site`. To test documentation properly, follow these steps: - 1. Clone ionic-site into `./dist/ionic-site` - - `git clone git@github.com:driftyco/ionic-site dist/ionic-site` +* Documentation is generated into `./../ionic-site`. To test documentation properly, follow these steps: + 1. Clone ionic-site into `./../ionic-site` + - `git clone git@github.com:driftyco/ionic-site ./../ionic-site` 2. Start jekyll, telling it to rebuild whenever the site changes - - `cd dist/ionic-site && jekyll serve -w` + - `cd ./../ionic-site && jekyll serve -w` 3. Go back to project root and build the docs - `gulp docs [--doc-version=(versionName|nightly)]` 4. Open localhost:4000 and see your changes! Re-run `gulp docs` again whenever you change something, and jekyll will update the site diff --git a/config/build.config.js b/config/build.config.js index 6d0cb27eee3..1a179078dfd 100644 --- a/config/build.config.js +++ b/config/build.config.js @@ -12,7 +12,7 @@ module.exports = { banner: '/*!\n' + - ' * Copyright 2014 Drifty Co.\n' + + ' * Copyright 2015 Drifty Co.\n' + ' * http://drifty.com/\n' + ' *\n' + ' * Ionic, v<%= pkg.version %>\n' + diff --git a/config/gulp-tasks/docs.js b/config/gulp-tasks/docs.js index 45249a779ef..e05cc749958 100644 --- a/config/gulp-tasks/docs.js +++ b/config/gulp-tasks/docs.js @@ -29,7 +29,7 @@ module.exports = function(gulp, argv) { config.set('currentVersion', docVersion); config.set( 'rendering.outputFolder', - argv.dist ? argv.dist : path.resolve(projectRoot, buildConfig.dist, 'ionic-site') + argv.dist ? argv.dist : path.resolve(projectRoot, '..', 'ionic-site') ); return dgeni.generator(config)().then(function() { diff --git a/scripts/circle/deploy.sh b/scripts/circle/deploy.sh index bd1775cda44..b34ae40e88c 100755 --- a/scripts/circle/deploy.sh +++ b/scripts/circle/deploy.sh @@ -30,54 +30,76 @@ function run { VERSION_NAME="nightly" fi - case $INDEX in - 0) - # Push release to ionic repo: release only - if [[ "$IS_RELEASE" == "true" ]]; then - ./scripts/release/publish.sh - # node_modules/.bin/gulp release-discourse - # node_modules/.bin/gulp release-github - # node_modules/.bin/gulp release-tweet - # node_modules/.bin/gulp release-irc - fi - ;; - 1) - # Update app-base: release only - if [[ "$IS_RELEASE" == "true" ]]; then - ./scripts/app-base/publish.sh - fi - ;; - 2) - # We have to install jekyll for the site task for now. - gem install jekyll --pre - # Install gulp globally for site deploy script. - npm install -g gulp - # Be sure to update the site one after the other, - # so the tasks don't have a push conflict - if [[ "$IS_RELEASE" == "true" ]]; then - ./scripts/site/config.sh - fi - # Update docs - ./scripts/site/docs.sh --version-name="$VERSION_NAME" - ;; - 3) - # Update demos - # ./scripts/demo/publish.sh --version-name="$VERSION_NAME" - # Update cdn - ./scripts/cdn/publish.sh --version-name="$VERSION_NAME" --old-version="$OLD_VERSION" - # Update bower - ./scripts/bower/publish.sh - ;; - 4) - # Update cdn - # ./scripts/cdn/publish.sh --version-name="$VERSION_NAME" --old-version="$OLD_VERSION" - ;; - 5) - # Update bower - # ./scripts/bower/publish.sh - ;; - esac + + # We have to install jekyll for the site task. + gem install jekyll --pre + # Install gulp globally for site deploy script. + npm install -g gulp + + if [[ "$IS_RELEASE" == "true" ]]; then + ./scripts/release/publish.sh + ./scripts/app-base/publish.sh + ./scripts/site/config.sh + fi + + # Update docs + ./scripts/site/docs.sh --version-name="$VERSION_NAME" + + # Update cdn + ./scripts/cdn/publish.sh --version-name="$VERSION_NAME" --old-version="$OLD_VERSION" + # Update bower + ./scripts/bower/publish.sh + + + # case $INDEX in + # 0) + # # Push release to ionic repo: release only + # if [[ "$IS_RELEASE" == "true" ]]; then + # ./scripts/release/publish.sh + # # node_modules/.bin/gulp release-discourse + # # node_modules/.bin/gulp release-github + # # node_modules/.bin/gulp release-tweet + # # node_modules/.bin/gulp release-irc + # fi + # ;; + # 1) + # # Update app-base: release only + # if [[ "$IS_RELEASE" == "true" ]]; then + # ./scripts/app-base/publish.sh + # fi + # ;; + # 2) + # # We have to install jekyll for the site task for now. + # gem install jekyll --pre + # # Install gulp globally for site deploy script. + # npm install -g gulp + # + # # Be sure to update the site one after the other, + # # so the tasks don't have a push conflict + # if [[ "$IS_RELEASE" == "true" ]]; then + # ./scripts/site/config.sh + # fi + # # Update docs + # ./scripts/site/docs.sh --version-name="$VERSION_NAME" + # ;; + # 3) + # # Update demos + # # ./scripts/demo/publish.sh --version-name="$VERSION_NAME" + # # Update cdn + # ./scripts/cdn/publish.sh --version-name="$VERSION_NAME" --old-version="$OLD_VERSION" + # # Update bower + # ./scripts/bower/publish.sh + # ;; + # 4) + # # Update cdn + # # ./scripts/cdn/publish.sh --version-name="$VERSION_NAME" --old-version="$OLD_VERSION" + # ;; + # 5) + # # Update bower + # # ./scripts/bower/publish.sh + # ;; + # esac } source $(dirname $0)/../utils.inc