From 1bcec29fb095038e8f271b4fe5737340e07ac15d Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Thu, 2 Jun 2016 12:52:18 +0300 Subject: [PATCH 1/8] chore(travis): Fix script and re-encrypt doc deploy key --- deploy_key.enc | Bin 3248 -> 3248 bytes package.json | 2 +- travis-gen-deploy-key.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy_key.enc b/deploy_key.enc index b14078f1de4f96ef3c5bd832a60f66147649b5a0..46a244951462bad7909dc5c96c0605bdb0e0fd15 100644 GIT binary patch literal 3248 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 diff --git a/package.json b/package.json index 4b928d1..a82210c 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ ".babelrc" ], "scripts": { - "repo-setup": "./travis-gen-deploy-key.sh", + "repo-setup": "./travis-gen-deploy-key.sh motiz88/js-starter-2016", "build": "cross-env BABEL_ENV=production babel src -d dist", "test": "mocha && semistandard", "semantic-release": "semantic-release pre && npm publish && semantic-release post", diff --git a/travis-gen-deploy-key.sh b/travis-gen-deploy-key.sh index 0ac7e36..a2e723a 100644 --- a/travis-gen-deploy-key.sh +++ b/travis-gen-deploy-key.sh @@ -3,7 +3,7 @@ travis login travis sync rm -f deploy_key.* ssh-keygen -t rsa -b 4096 -f deploy_key -travis encrypt-file deploy_key | \ +travis encrypt-file deploy_key -r $1 | \ grep -o -P "encrypted_\K[0-9a-f]+" | \ head -n 1 \ > travis-encryption-label From 0e186268e2e3a25068b5ec8e392b8b99b907a2cd Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Thu, 2 Jun 2016 13:12:38 +0300 Subject: [PATCH 2/8] chore: Move all doc auto-deploy files to auto-deploy-docs/ --- .travis.yml | 4 ++-- deploy_key.enc => auto-deploy-docs/deploy_key.enc | Bin doc-deploy.sh => auto-deploy-docs/doc-deploy.sh | 3 +++ .../travis-encryption-label | 0 .../travis-gen-deploy-key.sh | 1 + package.json | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) rename deploy_key.enc => auto-deploy-docs/deploy_key.enc (100%) rename doc-deploy.sh => auto-deploy-docs/doc-deploy.sh (98%) rename travis-encryption-label => auto-deploy-docs/travis-encryption-label (100%) rename travis-gen-deploy-key.sh => auto-deploy-docs/travis-gen-deploy-key.sh (94%) diff --git a/.travis.yml b/.travis.yml index 877a789..12caa33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ after_success: - 'curl -Lo travis_after_all.py https://git.io/travis_after_all' - python travis_after_all.py - export $(cat .to_export_back) &> /dev/null - - bash ./doc-deploy.sh + - bash ./auto-deploy-docs/doc-deploy.sh - npm run semantic-release branches: except: @@ -32,5 +32,5 @@ cache: - $NVM_DIR env: global: - - ENCRYPTION_LABEL: "$(cat travis-encryption-label)" + - ENCRYPTION_LABEL: "$(cat auto-deploy-docs/travis-encryption-label)" - COMMIT_AUTHOR_EMAIL: "motiz88@gmail.com" diff --git a/deploy_key.enc b/auto-deploy-docs/deploy_key.enc similarity index 100% rename from deploy_key.enc rename to auto-deploy-docs/deploy_key.enc diff --git a/doc-deploy.sh b/auto-deploy-docs/doc-deploy.sh similarity index 98% rename from doc-deploy.sh rename to auto-deploy-docs/doc-deploy.sh index 9e443c8..8f7a8c5 100644 --- a/doc-deploy.sh +++ b/auto-deploy-docs/doc-deploy.sh @@ -1,6 +1,9 @@ #!/bin/bash set -e # Exit with nonzero exit code if anything fails +cd "${0%/*}" +cd .. + SOURCE_BRANCH="master" TARGET_BRANCH="gh-pages" diff --git a/travis-encryption-label b/auto-deploy-docs/travis-encryption-label similarity index 100% rename from travis-encryption-label rename to auto-deploy-docs/travis-encryption-label diff --git a/travis-gen-deploy-key.sh b/auto-deploy-docs/travis-gen-deploy-key.sh similarity index 94% rename from travis-gen-deploy-key.sh rename to auto-deploy-docs/travis-gen-deploy-key.sh index a2e723a..429ca56 100644 --- a/travis-gen-deploy-key.sh +++ b/auto-deploy-docs/travis-gen-deploy-key.sh @@ -1,4 +1,5 @@ #!/bin/bash +cd "${0%/*}" travis login travis sync rm -f deploy_key.* diff --git a/package.json b/package.json index a82210c..e1d6e88 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ ".babelrc" ], "scripts": { - "repo-setup": "./travis-gen-deploy-key.sh motiz88/js-starter-2016", + "repo-setup": "./auto-deploy-docs/travis-gen-deploy-key.sh motiz88/js-starter-2016", "build": "cross-env BABEL_ENV=production babel src -d dist", "test": "mocha && semistandard", "semantic-release": "semantic-release pre && npm publish && semantic-release post", From 446480c0cfab1c3353f8b8c53e4a3eaf5d70830e Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Thu, 2 Jun 2016 13:56:31 +0300 Subject: [PATCH 3/8] fix(package): Build before publish --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e1d6e88..3614606 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "repo-setup": "./auto-deploy-docs/travis-gen-deploy-key.sh motiz88/js-starter-2016", "build": "cross-env BABEL_ENV=production babel src -d dist", "test": "mocha && semistandard", - "semantic-release": "semantic-release pre && npm publish && semantic-release post", + "semantic-release": "semantic-release pre && npm run build && npm publish && semantic-release post", "coveralls": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && coveralls < ./coverage/lcov.info && shx rm -rf ./coverage", "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --report html -- -R spec", "doc:serve": "documentation serve src/index.js --watch -c documentation.yml", From 28f5c2212185257869c6b0d2791a9542acc8dd8b Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Sat, 4 Jun 2016 03:42:04 +0300 Subject: [PATCH 4/8] chore(package): Remove babel-loader dep --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 3614606..474aeb0 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "babel-cli": "^6.9.0", "babel-core": "^6.9.0", "babel-eslint": "^6.0.4", - "babel-loader": "^6.2.4", "babel-preset-es2015": "^6.9.0", "babel-preset-stage-0": "^6.5.0", "babel-register": "^6.9.0", From c342220c218390b08c3fc267d7f618325bd8f721 Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Sat, 4 Jun 2016 03:42:25 +0300 Subject: [PATCH 5/8] chore(auto-deploy-docs): Fix path to deploy key --- auto-deploy-docs/doc-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto-deploy-docs/doc-deploy.sh b/auto-deploy-docs/doc-deploy.sh index 8f7a8c5..b1fec34 100644 --- a/auto-deploy-docs/doc-deploy.sh +++ b/auto-deploy-docs/doc-deploy.sh @@ -57,7 +57,7 @@ ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} -openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in ../deploy_key.enc -out deploy_key -d +openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy_key.enc -out deploy_key -d chmod 600 deploy_key eval `ssh-agent -s` ssh-add deploy_key From ccf4e7721870949c345757e782210c7460aa0fb4 Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Sat, 4 Jun 2016 03:48:30 +0300 Subject: [PATCH 6/8] chore(auto-deploy-docs): Fix path to deploy key again --- auto-deploy-docs/doc-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto-deploy-docs/doc-deploy.sh b/auto-deploy-docs/doc-deploy.sh index b1fec34..ed2463f 100644 --- a/auto-deploy-docs/doc-deploy.sh +++ b/auto-deploy-docs/doc-deploy.sh @@ -57,7 +57,7 @@ ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} -openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy_key.enc -out deploy_key -d +openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in auto_deploy_docs/deploy_key.enc -out deploy_key -d chmod 600 deploy_key eval `ssh-agent -s` ssh-add deploy_key From 3d2d9c251b1d6a3d5b1629d0acb3cb6cb1a433dd Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Sat, 4 Jun 2016 03:49:49 +0300 Subject: [PATCH 7/8] chore(auto-deploy-docs): Fix another typo in deploy key path --- auto-deploy-docs/doc-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto-deploy-docs/doc-deploy.sh b/auto-deploy-docs/doc-deploy.sh index ed2463f..ccdb1c4 100644 --- a/auto-deploy-docs/doc-deploy.sh +++ b/auto-deploy-docs/doc-deploy.sh @@ -57,7 +57,7 @@ ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} -openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in auto_deploy_docs/deploy_key.enc -out deploy_key -d +openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in auto-deploy-docs/deploy_key.enc -out deploy_key -d chmod 600 deploy_key eval `ssh-agent -s` ssh-add deploy_key From 304f7f4ba7337d787fe2b54e350ca805f9311f9a Mon Sep 17 00:00:00 2001 From: Moti Zilberman Date: Sat, 4 Jun 2016 09:47:32 +0300 Subject: [PATCH 8/8] chore: Fix deploy key path for (what should be) the last time --- auto-deploy-docs/doc-deploy.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/auto-deploy-docs/doc-deploy.sh b/auto-deploy-docs/doc-deploy.sh index ccdb1c4..774b05c 100644 --- a/auto-deploy-docs/doc-deploy.sh +++ b/auto-deploy-docs/doc-deploy.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e # Exit with nonzero exit code if anything fails -cd "${0%/*}" -cd .. +cd "${0%/*}" # /auto-deploy-docs +cd .. # SOURCE_BRANCH="master" TARGET_BRANCH="gh-pages" @@ -26,17 +26,17 @@ SHA=`git rev-parse --verify HEAD` # Clone the existing gh-pages for this repo into doc/ # Create a new empty branch if gh-pages doesn't exist yet (should only happen on first deploy) git clone $REPO doc -cd doc +cd doc # /doc git checkout $TARGET_BRANCH || git checkout --orphan $TARGET_BRANCH git clean -f git reset --hard -cd .. +cd .. # /doc # Run our compile script doCompile # Now let's go have some fun with the cloned repo -cd doc +cd doc # /doc git config user.name "Travis CI" git config user.email "$COMMIT_AUTHOR_EMAIL" @@ -57,7 +57,7 @@ ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key" ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv" ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR} ENCRYPTED_IV=${!ENCRYPTED_IV_VAR} -openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in auto-deploy-docs/deploy_key.enc -out deploy_key -d +openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in ../auto-deploy-docs/deploy_key.enc -out deploy_key -d chmod 600 deploy_key eval `ssh-agent -s` ssh-add deploy_key