diff --git a/.circleci/config.yml b/.circleci/config.yml index f02e0a8..28c2ad4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,22 +19,21 @@ jobs: - run: name: Install dependencies command: pip install -r requirements/dev.txt - # Upgrade dependencies for sqlalchemy and Flask-SQLAlchemy to pass unit tests - run: command: pip install sqlalchemy --upgrade && pip install Flask-SQLAlchemy --upgrade - run: - name: Setup dababase + name: db upgrade environment: FLASK_APP: /home/circleci/repo/autoapp.py FLASK_DEBUG: 0 command: flask db upgrade - run: - name: Flask test + name: flask test environment: FLASK_APP: /home/circleci/repo/autoapp.py FLASK_DEBUG: 0 command: flask test - back-deploy-heroku: + deploy: docker: - image: buildpack-deps:trusty steps: @@ -45,12 +44,12 @@ jobs: - run: name: Smoke Test command: | - HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/` + HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://devops-project-back.herokuapp.com/api/articles` if [[ "$HTTPCODE" -ne 200 ]]; then echo "heroku app not responding, failing deploy" \ exit 1; \ fi - docker-build-and-push: + build-push: docker: - image: docker:17.05.0-ce-git steps: @@ -68,14 +67,15 @@ jobs: docker tag app $DOCKER_HUB_USER_ID/devops-project-back:latest docker push $DOCKER_HUB_USER_ID/devops-project-back:$CIRCLE_BUILD_NUM docker push $DOCKER_HUB_USER_ID/devops-project-back:latest + workflows: version: 2 build-test: jobs: - install - - back-deploy-heroku: + - deploy: requires: - install - - docker-build-and-push: + - build-push: requires: - install \ No newline at end of file