diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 9c7b66b..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,80 +0,0 @@ -version: 2.1 - -jobs: - build_assets: - docker: - - image: node:12-alpine - environment: - OUTPUT_DIR: ./output_prod/static - steps: - - checkout - - run: npm ci - - run: mkdir -p ${OUTPUT_DIR} - - run: npm run-script build-prod - - run: ls -la ${OUTPUT_DIR} - - run: mkdir -p /tmp/workspace/static - - run: cp -R ${OUTPUT_DIR}/* /tmp/workspace/static - - persist_to_workspace: - root: /tmp/workspace - paths: - - static/* - - build_html: - docker: - - image: php:7.4-cli - environment: - APP_ENV: prod - APP_URL: https://vakhrushev.me - STATIC_DIR: ./output_prod/static - steps: - - attach_workspace: - at: /tmp/workspace - - checkout - - run: docker/php/provision.sh - - run: composer install --no-interaction --no-progress - - run: mkdir -p ${STATIC_DIR} - - run: cp -R /tmp/workspace/static/* ${STATIC_DIR} - - run: | - ./vendor/bin/sculpin generate \ - --env="${APP_ENV}" \ - --url="${APP_URL}" \ - --no-interaction \ - -vv - - run: mkdir -p /tmp/workspace/html - - run: cp -R ./output_prod/* /tmp/workspace/html - - persist_to_workspace: - root: /tmp/workspace - paths: - - html/* - - deploy: - docker: - - image: php:7.4-cli - steps: - - checkout - - add_ssh_keys - - run: apt-get update; apt-get install -yy openssh-client - - run: ssh-keyscan "vakhrushev.me" >> ~/.ssh/known_hosts - - run: docker/php/provision.sh - - attach_workspace: - at: /tmp/workspace - - run: mkdir -p ./output_prod - - run: cp -R /tmp/workspace/html/* ./output_prod - - run: ls -la ./output_prod - - run: ls -la ./output_prod/static - - run: dep deploy production -vv - -workflows: - version: 2 - build_and_deploy: - jobs: - - build_assets: - filters: - branches: - only: master - - build_html: - requires: - - build_assets - - deploy: - requires: - - build_html diff --git a/.editorconfig b/.editorconfig index 26d2119..10ad0c7 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,10 +6,7 @@ insert_final_newline = true indent_style = space indent_size = 4 -[*.{html,twig,yml,xml}] -indent_size = 2 - -[gulpfile.js] +[*.{html,twig,yml,yaml,xml}] indent_size = 2 [package.json] diff --git a/.env b/.env deleted file mode 100644 index 81a2c95..0000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -PROJECT=homepage -PHP_IMAGE=homepage-php -NODE_IMAGE=homepage-node diff --git a/Makefile b/Makefile index 11e2351..a737024 100644 --- a/Makefile +++ b/Makefile @@ -43,5 +43,3 @@ watch: clean build-assets deploy: build-prod invoke deploy -rollback: - ./tools/dep rollback production -vv diff --git a/README.md b/README.md index 0a4ad43..a8e23db 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -Source for [vakhrushev.me](http://vakhrushev.me). +Source for [vakhrushev.me](https://vakhrushev.me). Build: - make build-docker - make build + task build-docker + task build Deploy: - make deploy + task deploy