Skip to content
This repository was archived by the owner on Jan 29, 2025. It is now read-only.

No migrations left behind, in CI #1591

Merged
bors merged 3 commits into from
Oct 19, 2018
Merged

No migrations left behind, in CI #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb88df4
No migrations left behind, in CI
peterbe Oct 18, 2018
a0aec72
its own step instead
peterbe Oct 18, 2018
328dd1f
run migrate once for better error message
peterbe Oct 18, 2018
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
6 changes: 5 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
working_directory: ~/normandy

environment:
COMPOSE_FILE: ci/docker-compose.yml
COMPOSE_FILE: ci/docker-compose.yml
Copy link
Copy Markdown
Contributor Author

@peterbe peterbe Oct 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My vscode fixes yaml files automatically and although this is unrelated I don't think it hurts to correct.

Copy link
Copy Markdown
Contributor

@mythmon mythmon Oct 18, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the future it would be good to only include these kind of fixes to files that are already being changed in the PR. This change is more correct so lets keep it, but if we're going to have automatic fixes for these kind of files, we should add them as rules to Therapist instead of ad-hoc changes.


steps:
- checkout
Expand Down Expand Up @@ -57,6 +57,10 @@ jobs:
name: Python Tests
command: docker-compose run web python-tests

- run:
name: Missing migrations
command: docker-compose run web migrations-check

- run:
name: Contract tests
command: |
Expand Down
9 changes: 8 additions & 1 deletion bin/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -eo pipefail

usage() {
echo "usage: ./bin/run.sh python-tests|js-tests|lint|start"
echo "usage: ./bin/run.sh python-tests|js-tests|lint|start|migrations-check"
exit 1
}

Expand Down Expand Up @@ -37,6 +37,13 @@ case $1 in
fi
set -e
;;
migrations-check)
./manage.py migrate
echo "Checking that all migrations have been made"
./manage.py makemigrations --check --no-input --dry-run || (
echo "You probably have migrations that need to be created" && exit 1
)
;;
python-tests)
echo "Running Python tests"
junit_path=$ARTIFACTS_PATH/test_results/python_tests
Expand Down