diff --git a/deploy.sh b/deploy.sh index f3a7ea71..ce7818a5 100644 --- a/deploy.sh +++ b/deploy.sh @@ -8,38 +8,6 @@ function doCompile { python main.py } -function pushBranch { - # Now let's go have some fun with the cloned repo - cd out - ls - git config user.name "Travis CI" - git config user.email "$COMMIT_AUTHOR_EMAIL" - - # If there are no changes to the compiled out (e.g. this is a README update) then just bail. - #if git diff --quiet; then - # echo "No changes to the output on this push; exiting." - # exit 0 - #fi - - # Commit the "changes", i.e. the new version. - # The delta will show diffs between new and old versions. - git add -A . - git commit --allow-empty -m "Deploy to GitHub: ${SHA}" - - # Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc - 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 - chmod 600 ../deploy_key - eval `ssh-agent -s` - ssh-add ../deploy_key - - # Now that we're all set up, we can push. - git push $SSH_REPO $TARGET_BRANCH -} - # Pull requests and commits to other branches shouldn't try to deploy, just build to verify #if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "$SOURCE_BRANCH" ]; then # echo "Skipping deploy; just doing a build." @@ -63,14 +31,39 @@ cd .. rm -rf out/**/* || exit 0 # Run our compile script -#doCompile +doCompile -# Push merge or push to our files repo, not pulls. -if [ "${ghToken:-false}" != "false" ]; then - echo This is a Push - doCompile - pushBranch -else - echo This is a PR - doCompile +# Don't push to our branch for PRs. +if [ "${ghToken:-false}" == "false" ]; then + exit 0 fi + +# Now let's go have some fun with the cloned repo +cd out +ls +git config user.name "Travis CI" +git config user.email "$COMMIT_AUTHOR_EMAIL" + +# If there are no changes to the compiled out (e.g. this is a README update) then just bail. +#if git diff --quiet; then +# echo "No changes to the output on this push; exiting." +# exit 0 +#fi + +# Commit the "changes", i.e. the new version. +# The delta will show diffs between new and old versions. +git add -A . +git commit --allow-empty -m "Deploy to GitHub: ${SHA}" + +# Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc +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 +chmod 600 ../deploy_key +eval `ssh-agent -s` +ssh-add ../deploy_key + +# Now that we're all set up, we can push. +git push $SSH_REPO $TARGET_BRANCH