diff --git a/.ci/build.sh b/.ci/build.sh index 2184ed02..7701abda 100755 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if [ $TRAVIS_BRANCH == "master" ]; then +if [ $CI_BRANCH == "master" ]; then gulp build --production else gulp build diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 233e2999..35e83917 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -21,10 +21,7 @@ echo " Starting rsync deployment " echo "=============================================" echo "$(tput sgr0)" # reset -# prevent interactive prompt -ssh-keyscan -H $DEPLOY_HOST >> ~/.ssh/known_hosts - -rsync --recursive --delete --delete-excluded --checksum --verbose -e "ssh" $TRAVIS_BUILD_DIR/_site/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH +rsync --recursive --delete --delete-excluded --checksum --verbose -e "ssh" $CI_BUILD_URL/_site/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH echo "$(tput setaf 64)" # green echo "---------------------------------------------" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fb5c779d..00000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -sudo: false -language: ruby -rvm: -- 2.2.2 -- 1.9.3 -cache: - bundler: true - directories: - - node_modules - - bower_components - - _site/media/gen -addons: - apt: - packages: - - libgsl0-dev -before_script: ".ci/setup.sh" -script: ".ci/build.sh" -deploy: - skip_cleanup: true - provider: script - script: ".ci/deploy.sh" - on: - branch: master -notifications: - slack: - secure: Ki6tFSrxaUnAugBFnmM2ydI/38/Ahyoaf9lhohoOCNnPk/QIYrI8MBlBXNVI04v2GOhFTvVljY5yJPlzrAUjH3eu34f6ObBe6rh3LjfvtE9eA94pBoSLJE/eSqB6FUBr324kxXpsWHRv93gyQ9I6Hk2CURv58de2z9Ytkwu2Epo= -env: - global: - - secure: gYkLtgw9gfuFpv47oiKkBGyUnRCG1MUYynLV3G99KN4V7QXcCpSSMp59/kl7v3Hqo2kIvTwTx+upLacAcgztpLifR5xrUYBtOrVG1XIsbsvinUqH1YSmcIEdTGPNrTw+UPyAJLxNMkvJkmtcakEhKe6kRlZUl2fC0JefeTBIFgg= - - secure: kM46SDTgjcpB65McCohqFrZL6vuQRSRt7wug4QfPSAM+8O291GnVUWV7mMmOr1SdTDW9VSmenC6H8sa+BrEifrU5XFG4t5iwNJIjDUOFmZVLqIPfVizvHN6wIPIUQhvI9eIjZnfGAfVGr+EBaqwoBR7qSjVhnDwR2jKqhGFd4Qk= - - secure: Y7sWVH+8eBgBZeRPQ7izlZFPDNYVm+QPLpGAzPl6q17z07YHKxauaRGm9G6vhG12oyciYWe3+rPT+TQy4EkD27S5dGgekVvY8ZQ6SKUST2WCVD61dTsm+Ls7jcbx/4dKHAc9+8/VB6f61bFZAsH1UX0qyjCKFgZtN00ThrsQIog= -before_install: -- openssl aes-256-cbc -K $encrypted_b9173c5ce350_key -iv $encrypted_b9173c5ce350_iv -in deploykey.enc -out deploykey -d diff --git a/README.md b/README.md index 34708455..8014f653 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ kremalicious3 > [kremalicious.com](http://kremalicious.com) based on [Jekyll](http://jekyllrb.com). Neat. -[![Build Status](https://travis-ci.org/kremalicious/kremalicious3.svg?branch=master)](https://travis-ci.org/kremalicious/kremalicious3) +[ ![Codeship Status for kremalicious/kremalicious3](https://codeship.com/projects/9fd79770-3c49-0133-6289-3ebbb4d77cd4/status?branch=master)](https://codeship.com/projects/102237) [![Dependency Status](https://gemnasium.com/kremalicious/kremalicious3.svg)](https://gemnasium.com/kremalicious/kremalicious3) diff --git a/deploykey.enc b/deploykey.enc deleted file mode 100644 index cef3756e..00000000 Binary files a/deploykey.enc and /dev/null differ diff --git a/gulpfile.js b/gulpfile.js index 355a62bc..5c6d3ba2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -137,7 +137,6 @@ gulp.task('html', function() { useShortDoctype: true, collapseBooleanAttributes: true, removeRedundantAttributes: true, - removeEmptyAttributes: true, removeEmptyAttributes: true }))) .pipe(gulp.dest(dist))