diff --git a/.gitignore b/.gitignore index 38afc934..e8d87581 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ jspm_packages /demo/build .tmp /coverage +.ghpages-tmp diff --git a/.travis.yml b/.travis.yml index 077a1cc3..208306e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,11 +41,7 @@ deploy: secure: PuhWLERrCEFmXmdFpw2OVFlqpOIVDmgwk5JUJOYaFdVCh/smp0+jZCQ4vrdFpuG96rnDVirD+A8xvW6NgsNNaRthLgOB/LRdFN69rU6Gvn3At6wlnC55t5dlhxPvCfnzJcHVBLXX4EmMkjnZqDg2uczXTzPodr3FnQJNuXmP8B33fzDVLyHccvXZ90abwXWVrgRIXPU28niqCR8DOC2OTzs7wqz+BLNkYDRRbyYXsg62HWuD33x5iof5IqBmhzBt3usCGmF3QGcgHrXHdZw3sZnit8+Bua++3KrXR0x6HGXXN1AoXVmCAkCa5OTQ5R3tCRxiJN3P2KLnvWeZR74sTFkovJB/6pGCvbJ/c7Wnuw6sD7SgOUBD359ULB6lAf5OnxBLoNebX4JxxVXF+zA4E3Bl44VxkzDpPWc15xqBPMB5vBREzMVmJ5mExn2s5cmLQjADbl9h0y6gZnhnNJ+iTmqtrVyM0ZkF2rPrzrTdGD+ULmRIlTMkdD1bh+/TJ3RdXT3P4/zNUJmiNnvgnnJVYYvsGaXWF+7uCVHT/8k2RsoSHqgkqh0gkDqGSwVix55y5mC7T2Vk9lMBhm6MvFJXaonOX0kxJS4EDQ3plPd6/ybG+TLhwggYnQ8o9msU5Nt6FpUShKiezjKurIhbQZdwlVivX3tahjW2QjNDO58xGgY= on: tags: true - - skip_cleanup: true - provider: script - script: npm run github-release - on: - tags: true + condition: $JOB != e2e - skip_cleanup: true provider: script script: npm run branch-release @@ -56,5 +52,5 @@ deploy: provider: script script: npm run deploy on: - branch: master + tags: true condition: $JOB != e2e diff --git a/build/paths.js b/build/paths.js index e2f27ffe..988f2cc8 100644 --- a/build/paths.js +++ b/build/paths.js @@ -9,7 +9,8 @@ var paths = { output: 'dist/', tmp: '.tmp/', demo: 'demo/**/*', - tests: '{lib,tests}/**/*.spec.js' + tests: '{lib,tests}/**/*.spec.js', + releases: 'demo/releases/' } paths.redocBuilt = path.join(paths.output, paths.outputName); diff --git a/build/prepare_deploy.sh b/build/prepare_deploy.sh index c55a08ae..137f404c 100755 --- a/build/prepare_deploy.sh +++ b/build/prepare_deploy.sh @@ -1,6 +1,15 @@ #!/bin/bash set -e set -x +mkdir -p .ghpages-tmp && cd .ghpages-tmp +git checkout gh-pages +cp -R ../releases/* . +git checkout master +cd - +gulp build cd demo cp -R ../dist ./dist +mkdir -p releases +cp -R ../.ghpages-tmp/* ./releases/ cd - +gulp copy-version diff --git a/build/tasks/copy-version.js b/build/tasks/copy-version.js new file mode 100644 index 00000000..aaf93012 --- /dev/null +++ b/build/tasks/copy-version.js @@ -0,0 +1,10 @@ +var gulp = require('gulp'); +var path = require('path'); +var paths = require('../paths'); + +gulp.task('copy-version', function() { + var tag = 'v' + require(path.join(__dirname, '../../package.json')).version; + gulp.src(paths.redocBuilt + '.min.js') + .pipe(gulp.dest(path.join(paths.releases, tag))) + .pipe(gulp.dest(path.join(paths.releases, 'latest'))); +}); diff --git a/build/tasks/github-release.js b/build/tasks/github-release.js deleted file mode 100644 index d2303cb2..00000000 --- a/build/tasks/github-release.js +++ /dev/null @@ -1,12 +0,0 @@ -var gulp = require('gulp'); -var release = require('gulp-github-release'); -var path = require('path'); -var paths = require('../paths'); - -gulp.task('github-release', ['build'], function(){ - gulp.src(paths.redocBuilt + '.min.js') - .pipe(release({ - token: process.env.GH_TOKEN, - manifest: require(path.join(__dirname, '../../package.json')) - })); -}); diff --git a/package.json b/package.json index 271fa166..598d4b32 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,7 @@ "branch-release": "git reset --hard && branch-release", "unit": "gulp test", "e2e": "gulp e2e", - "deploy": "build/prepare_deploy.sh && deploy-to-gh-pages demo", - "github-release": "gulp github-release" + "deploy": "build/prepare_deploy.sh && deploy-to-gh-pages demo" }, "keywords": [ "OpenAPI", @@ -41,7 +40,6 @@ "json-formatter-js": "npm:json-formatter-js@^0.2.0", "json-pointer": "npm:json-pointer@^0.3.0", "json-schema-instantiator": "npm:json-schema-instantiator@^0.3.0", - "json-schema-ref-parser": "npm:json-schema-ref-parser@2.2.0", "marked": "npm:marked@^0.3.5", "prismjs": "npm:prismjs@^1.3.0", "scrollparent": "npm:scrollparent@^0.1.0", @@ -77,7 +75,6 @@ "gulp": "^3.9.1", "gulp-concat": "^2.6.0", "gulp-eslint": "^1.1.1", - "gulp-github-release": "^1.1.2", "gulp-inline-ng2-template": "^1.1.2", "gulp-protractor": "^2.1.0", "gulp-rename": "^1.2.2", diff --git a/system.config.js b/system.config.js index fddc50cc..8fb331e0 100644 --- a/system.config.js +++ b/system.config.js @@ -50,7 +50,6 @@ System.config({ "json-formatter-js": "npm:json-formatter-js@0.2.0", "json-pointer": "npm:json-pointer@0.3.0", "json-schema-instantiator": "npm:json-schema-instantiator@0.3.0", - "json-schema-ref-parser": "npm:json-schema-ref-parser@2.2.0", "marked": "npm:marked@0.3.5", "prismjs": "npm:prismjs@1.3.0", "scrollparent": "npm:scrollparent@0.1.0", @@ -143,15 +142,6 @@ System.config({ "rxjs": "npm:rxjs@5.0.0-beta.7", "zone.js": "npm:zone.js@0.6.12" }, - "npm:argparse@1.0.3": { - "assert": "github:jspm/nodelibs-assert@0.1.0", - "fs": "github:jspm/nodelibs-fs@0.1.2", - "lodash": "npm:lodash@3.10.1", - "path": "github:jspm/nodelibs-path@0.1.0", - "process": "github:jspm/nodelibs-process@0.1.2", - "sprintf-js": "npm:sprintf-js@1.0.3", - "util": "github:jspm/nodelibs-util@0.1.0" - }, "npm:argparse@1.0.7": { "fs": "github:jspm/nodelibs-fs@0.1.2", "path": "github:jspm/nodelibs-path@0.1.0", @@ -447,10 +437,6 @@ System.config({ "npm:es6-promise@3.1.2": { "process": "github:jspm/nodelibs-process@0.1.2" }, - "npm:esprima@2.7.1": { - "fs": "github:jspm/nodelibs-fs@0.1.2", - "process": "github:jspm/nodelibs-process@0.1.2" - }, "npm:evp_bytestokey@1.0.0": { "buffer": "github:jspm/nodelibs-buffer@0.1.0", "create-hash": "npm:create-hash@1.1.2", @@ -569,13 +555,6 @@ System.config({ "crypto": "github:jspm/nodelibs-crypto@0.1.0", "jsbn": "npm:jsbn@0.1.0" }, - "npm:js-yaml@3.5.2": { - "argparse": "npm:argparse@1.0.3", - "esprima": "npm:esprima@2.7.1", - "fs": "github:jspm/nodelibs-fs@0.1.2", - "process": "github:jspm/nodelibs-process@0.1.2", - "systemjs-json": "github:systemjs/plugin-json@0.1.2" - }, "npm:js-yaml@3.6.0": { "argparse": "npm:argparse@1.0.7", "buffer": "github:jspm/nodelibs-buffer@0.1.0", @@ -602,7 +581,6 @@ System.config({ "es6-promise": "npm:es6-promise@3.1.2", "events": "github:jspm/nodelibs-events@0.1.1", "fs": "github:jspm/nodelibs-fs@0.1.2", - "http": "npm:stream-http@2.3.0", "https": "github:jspm/nodelibs-https@0.1.0", "js-yaml": "npm:js-yaml@3.6.0", "ono": "npm:ono@2.2.1", @@ -632,9 +610,6 @@ System.config({ "npm:lodash.get@4.2.1": { "lodash._stringtopath": "npm:lodash._stringtopath@4.7.1" }, - "npm:lodash@3.10.1": { - "process": "github:jspm/nodelibs-process@0.1.2" - }, "npm:lru-cache@4.0.1": { "pseudomap": "npm:pseudomap@1.0.2", "util": "github:jspm/nodelibs-util@0.1.0", @@ -661,10 +636,6 @@ System.config({ "process": "github:jspm/nodelibs-process@0.1.2", "querystring": "github:jspm/nodelibs-querystring@0.1.0" }, - "npm:ono@2.0.1": { - "process": "github:jspm/nodelibs-process@0.1.2", - "util": "github:jspm/nodelibs-util@0.1.0" - }, "npm:ono@2.2.1": { "process": "github:jspm/nodelibs-process@0.1.2", "util": "github:jspm/nodelibs-util@0.1.0"