From 9e8306bbe355653e30a407caad3471e26dd722fd Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 6 Sep 2017 18:01:29 +0100 Subject: [PATCH] Tidy repo --- .travis.yml | 27 --------------------------- composer.json | 8 +++++--- deploy_key.enc | Bin 3248 -> 0 bytes publish.sh | 30 ------------------------------ source/CNAME | 1 - 5 files changed, 5 insertions(+), 61 deletions(-) delete mode 100644 .travis.yml delete mode 100644 deploy_key.enc delete mode 100755 publish.sh delete mode 100644 source/CNAME diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ee2a512c8..000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: php -php: 7 -sudo: true - -branches: - only: - - source - -cache: - directories: - - $HOME/.composer/cache - - $HOME/.yarn-cache - -before_install: - - openssl aes-256-cbc -K $encrypted_01701315b81b_key -iv $encrypted_01701315b81b_iv -in deploy_key.enc -out deploy_key -d - - chmod 600 deploy_key - - eval `ssh-agent -s` - - ssh-add deploy_key - - yarn --pure-lockfile - - composer install --prefer-dist --no-dev - -script: ./publish.sh - -env: - global: - - ENCRYPTION_LABEL: 01701315b81b - - COMMIT_AUTHOR_EMAIL: "oliver@oliverdavies.uk" diff --git a/composer.json b/composer.json index 2e324ff77..c5ae3d114 100644 --- a/composer.json +++ b/composer.json @@ -7,16 +7,18 @@ }, "require": { "php": "^5.5|^7.0", - "behat/mink-extension": "@stable", - "behat/mink-goutte-driver": "@stable", "dflydev/embedded-composer": "^1.0@dev", "mavimo/sculpin-redirect-bundle": "@dev", - "opdavies/sculpin-content-generator-bundle": "@stable", "opdavies/sculpin-gist-embed-bundle": "^0.1", "opdavies/sculpin-twig-markdown-bundle": "^0.1", "sculpin/sculpin": "^2.1@dev", "tsphethean/sculpin-related-posts-bundle": "~0.1.0" }, + "require-dev": { + "behat/mink-extension": "@stable", + "behat/mink-goutte-driver": "@stable", + "opdavies/sculpin-content-generator-bundle": "@stable" + }, "config": { "sort-packages": true } diff --git a/deploy_key.enc b/deploy_key.enc deleted file mode 100644 index ee81f34905683313ed6faca42b38450825111d50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3248 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 diff --git a/publish.sh b/publish.sh deleted file mode 100755 index e79a04a03..000000000 --- a/publish.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -set -e - -SITE_ENV="prod" -REPO=`git config remote.origin.url` -SSH_REPO=${REPO/https:\/\/github.com\//git@github.com:} -SHA=`git rev-parse --verify HEAD` -BUILD_DIR="_deploy" - -# Prepare the build directory. -git clone $REPO $BUILD_DIR -pushd $BUILD_DIR -git checkout master || git checkout --orphan master -popd -rm -rf ${BUILD_DIR}/**/* || exit 0 - -# Re-generate the site. -node_modules/.bin/gulp --production -vendor/bin/sculpin generate --no-interaction --clean --env=prod -touch output_prod/.nojekyll - -# Add, commit and push the changes. -pushd $BUILD_DIR -mv ../output_prod/* . -git config --local user.email oliver@oliverdavies.uk -git add -A . -git commit -m "Re-generate site: $SHA" -git push $SSH_REPO master -popd diff --git a/source/CNAME b/source/CNAME deleted file mode 100644 index 601c884f8..000000000 --- a/source/CNAME +++ /dev/null @@ -1 +0,0 @@ -www.oliverdavies.uk