Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CircleCI workflow improvements #4296

Merged
merged 3 commits into from
Oct 27, 2019
Merged

CircleCI workflow improvements #4296

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fb0db0
CircleCI workflow improvements
arikfr Oct 27, 2019
d44e370
Fix YAML syntax error.
arikfr Oct 27, 2019
1b08418
Add separate build Docker image step for master branch
arikfr Oct 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -89,31 +100,25 @@ 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-unit-tests
- backend-lint
- backend-unit-tests:
requires:
- backend-lint
- frontend-lint
- frontend-unit-tests:
requires:
- backend-lint
- frontend-lint
- frontend-e2e-tests:
requires:
- frontend-lint
- build-docker-image:
- build-preview-docker-image:
requires:
- backend-unit-tests
- frontend-unit-tests
Expand All @@ -122,5 +127,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