diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 0cef4b57..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,51 +0,0 @@ -version: 2 -jobs: - build: - working_directory: ~/circulate - docker: - - image: python:3.6.0 - environment: - FLASK_CONFIG: testing - TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable - - image: postgres:9.6.2 - environment: - POSTGRES_USER: ubuntu - POSTGRES_DB: circle_test - POSTGRES_PASSWORD: "" - - image: selenium/standalone-chrome:3.1.0 - steps: - - checkout - - restore_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - - run: - command: | - python3 -m venv venv - . venv/bin/activate - pip install -r requirements/dev.txt - - run: - name: setup Heroku - command: bash .circleci/setup-heroku.sh - - save_cache: - key: deps1-{{ .Branch }}-{{ checksum "requirements/dev.txt" }} - paths: - - "venv" - - run: - command: | - . venv/bin/activate - python manage.py test - - store_artifacts: - path: test-reports/ - destination: tr1 - - store_test_results: - path: test-reports/ - - add_ssh_keys: - fingerprints: - - "48:a0:87:54:ca:75:32:12:c6:9e:a2:77:a4:7a:08:a4" - - deploy: - name: Deploy Master to Heroku - command: | - if [ "${CIRCLE_BRANCH}" == "master" ]; then - git push heroku master - heroku run python manage.py deploy - heroku restart - fi diff --git a/circle.yml b/circle.yml new file mode 100644 index 00000000..a58f2a95 --- /dev/null +++ b/circle.yml @@ -0,0 +1,22 @@ +mahine: + python: + version: 3.6.0 + + environment: + FLASK_CONFIG: testing + TEST_DATABASE_URL: postgresql://ubuntu@localhost/circle_test?sslmode=disable + +dependencies: + post: + #- python3 -m venv venv; + #- . venv/bin/activate; + - pip install -r requirements/dev.txt + - bash .circleci/setup-heroku.sh + +deployment: + production: + branch: 1.0-kim-test-heroku + commands: + - git push heroku master + - heroku run python manage.py deploy + - heroku restart