diff --git a/.circleci/config.yml b/.circleci/config.yml index 354cdcd..e73424c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,35 +22,35 @@ jobs: key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }} paths: - "venv" - test: - docker: - - image: circleci/python:3.9-buster-node-browsers - environment: - DATABASE_URL: postgresql://myUser:myPassword@localhost:5432/my_database_postgres - FLASK_APP: autoapp.py - CONDUIT_SECRET: 'something-really-secret' - FLASK_DEBUG: 1 - - image: circleci/postgres:9.6.2-alpine - environment: - POSTGRES_USER: myUser - POSTGRES_DB: my_database_postgres - POSTGRES_PASSWORD: myPassword - steps: - - checkout - - restore_cache: - key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }} - - run: - name: Waiting postgresql - command : dockerize -wait tcp://localhost:5432 -timeout 1m - # - run: - # name: Activate tests - # command: . venv/bin/activate - # - run: - # name: Launching upgrade - # command: flask db upgrade - # - run: - # name: Launching tests - # command: flask test + # test: + # docker: + # - image: circleci/python:3.9-buster-node-browsers + # environment: + # DATABASE_URL: postgresql://myUser:myPassword@localhost:5432/my_database_postgres + # FLASK_APP: autoapp.py + # CONDUIT_SECRET: 'something-really-secret' + # FLASK_DEBUG: 1 + # - image: circleci/postgres:9.6.2-alpine + # environment: + # POSTGRES_USER: myUser + # POSTGRES_DB: my_database_postgres + # POSTGRES_PASSWORD: myPassword + # steps: + # - checkout + # - restore_cache: + # key: deps-{{ checksum "requirements/dev.txt"}}-{{ .Environment.CACHE_VERSION }} + # - run: + # name: Waiting postgresql + # command : dockerize -wait tcp://localhost:5432 -timeout 1m + # - run: + # name: Activate tests + # command: . venv/bin/activate + # - run: + # name: Launching upgrade + # command: flask db upgrade + # - run: + # name: Launching tests + # command: flask test deploy-heroku: docker: @@ -69,7 +69,10 @@ jobs: command: HTTPCODE=`curl -s -o /dev/null -w "%{http_code}" https://$HEROKU_APP_NAME.herokuapp.com/api/articles` - run: name: Smoke check - command: if [ "$HTTPCODE" -ne 200 ];then echo "heroku app not responding, failing to deploy" exit 1 fi; + command: if [ "$HTTPCODE" -ne 200 ];then + echo "heroku app not responding, failing to deploy" + exit 1 + fi; docker-build-push: working_directory: /dockerapp docker: