Merge branch 'master' into black

getredash · Oct 27, 2019 · 9cb9d5e · 9cb9d5e
2 parents a050f07 + 88ae639
commit 9cb9d5e
Showing 1 changed file with 32 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,18 @@
 version: 2.0
 
+build-docker-image-job: &build-docker-image-job
+ docker:
+ - image: circleci/node:8
+ steps:
+ - setup_remote_docker
+ - checkout
+ - run: sudo apt install python3-pip
+ - run: sudo pip3 install -r requirements_bundles.txt
+ - run: .circleci/update_version
+ - run: npm run bundle
+ - run: .circleci/docker_build
 jobs:
- python-flake8-tests:
+ backend-lint:
  docker:
  - image: circleci/python:3.7.0
  steps:
@@ -96,33 +107,27 @@ jobs:
  - run:
  name: Execute Cypress tests
  command: npm run cypress run-ci
- build-docker-image:
- docker:
- - image: circleci/node:8
- steps:
- - setup_remote_docker
- - checkout
- - run: sudo apt install python3-pip
- - run: sudo pip3 install -r requirements_bundles.txt
- - run: .circleci/update_version
- - run: npm run bundle
- - run: .circleci/docker_build
+ build-docker-image: *build-docker-image-job
+ build-preview-docker-image: *build-docker-image-job
 workflows:
  version: 2
  build:
  jobs:
- - python-flake8-tests
+ - backend-lint
  - black
- - backend-unit-tests
+ - backend-unit-tests:
+ requires:
+ - backend-lint
  - frontend-lint
  - frontend-unit-tests:
  requires:
+ - backend-lint
  - frontend-lint
  - frontend-e2e-tests:
  requires:
  - frontend-lint
  - black
- - build-docker-image:
+ - build-preview-docker-image:
  requires:
  - backend-unit-tests
  - frontend-unit-tests
@@ -131,5 +136,16 @@ workflows:
  branches:
  only:
  - master
- - preview-image
+ - hold:
+ type: approval
+ requires:
+ - backend-unit-tests
+ - frontend-unit-tests
+ - frontend-e2e-tests
+ filters:
+ branches:
+ only:
  - /release\/.*/
+ - build-docker-image:
+ requires:
+ - hold