From 82060357c728819acd04ace21e618d2eacb6fa81 Mon Sep 17 00:00:00 2001 From: Roman Hotsiy Date: Fri, 20 May 2016 22:37:10 +0300 Subject: [PATCH] Get rid of bash --- build/prepare_deploy.js | 32 ++++++++++++++++++++++++++++++++ build/prepare_deploy.sh | 21 --------------------- build/run_tests.js | 13 +++++++++++++ build/run_tests.sh | 8 -------- package.json | 4 ++-- 5 files changed, 47 insertions(+), 31 deletions(-) create mode 100755 build/prepare_deploy.js delete mode 100755 build/prepare_deploy.sh create mode 100755 build/run_tests.js delete mode 100755 build/run_tests.sh diff --git a/build/prepare_deploy.js b/build/prepare_deploy.js new file mode 100755 index 00000000..74638103 --- /dev/null +++ b/build/prepare_deploy.js @@ -0,0 +1,32 @@ +#!/usr/bin/env node +'use strict'; +require('shelljs/global'); + +var paths = require('./paths'); +var path = require('path'); + +// copy old releases +mkdir('-p', '.ghpages-tmp'); +cd('.ghpages-tmp'); + +// reset local changes before checkout +exec('git reset --hard'); +exec('git fetch origin gh-pages:gh-pages'); +exec('git checkout gh-pages'); +cp('-R', '../releases/*', '.'); +exec('git checkout @{-1}'); +cd('..'); + +// build +exec('npm run build-dist'); +cd('demo'); +mkdir('-p', 'dist'); +cp('-R', '../dist/*', './dist/'); +mkdir('-p', 'releases'); +cp('-R', '../.ghpages-tmp/*', './releases/'); +cd('..'); +var version = 'v' + require(path.join(__dirname, '../package.json')).version + '/'; +var versionDir = path.join(paths.releases, version); +mkdir('-p', versionDir) +cp(paths.redocBuilt + '.min.js', versionDir); +cp(paths.redocBuilt + '.min.js', path.join(paths.releases, 'latest/')); diff --git a/build/prepare_deploy.sh b/build/prepare_deploy.sh deleted file mode 100755 index c544aa4b..00000000 --- a/build/prepare_deploy.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -set -e -set -x -# copy old releases -mkdir -p .ghpages-tmp && cd .ghpages-tmp -# reset local changes before checkout -git reset --hard -git fetch origin gh-pages:gh-pages -git checkout gh-pages -cp -R ../releases/* . -git checkout @{-1} -cd - - -# build -npm run build-dist -cd demo -cp -R ../dist/* ./dist/ -mkdir -p releases -cp -R ../.ghpages-tmp/* ./releases/ -cd - -gulp copy-version diff --git a/build/run_tests.js b/build/run_tests.js new file mode 100755 index 00000000..40b488fa --- /dev/null +++ b/build/run_tests.js @@ -0,0 +1,13 @@ +#!/usr/bin/env node +'use strict'; + +require('shelljs/global'); +set('-e'); + +if (process.env.JOB === 'e2e-guru') { + exec('npm run e2e'); +} else { + exec('npm run unit'); + console.log('Starting Basic E2E'); + exec('npm run e2e'); +} diff --git a/build/run_tests.sh b/build/run_tests.sh deleted file mode 100755 index 6d05f49d..00000000 --- a/build/run_tests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -if [ "$JOB" = "e2e-guru" ]; then - npm run e2e -else - npm run unit - echo "Starting Basic E2E" - npm run e2e -fi diff --git a/package.json b/package.json index e3595801..8a6c5fdd 100644 --- a/package.json +++ b/package.json @@ -8,14 +8,14 @@ }, "main": "dist/redoc.min.js", "scripts": { - "test": "gulp lint && ./build/run_tests.sh", + "test": "gulp lint && node ./build/run_tests.js", "jspm-install": "jspm install", "start": "gulp serve", "build-dist": "gulp build --prod", "branch-release": "git reset --hard && branch-release", "unit": "gulp test", "e2e": "gulp e2e --prod", - "deploy": "build/prepare_deploy.sh && deploy-to-gh-pages demo" + "deploy": "node ./build/prepare_deploy.js && deploy-to-gh-pages demo" }, "keywords": [ "OpenAPI",