File tree Expand file tree Collapse file tree 2 files changed +9
-8
lines changed Expand file tree Collapse file tree 2 files changed +9
-8
lines changed Original file line number Diff line number Diff line change 40
40
41
41
- name : Run Docker container for lint
42
42
run : |
43
- docker run --rm intbot make in-container /lint
44
- docker run --rm intbot make in-container /type-check
43
+ docker run --rm intbot make ci /lint
44
+ docker run --rm intbot make ci /type-check
45
45
46
46
services :
47
47
postgres :
Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ DOCKER_RUN=docker run --add-host=host.internal:host-gateway -e DJANGO_ENV="test"
11
11
MANAGE =cd intbot && ./manage.py
12
12
# In container we run with migrations
13
13
CONTAINER_TEST_CMD=DJANGO_SETTINGS_MODULE ="intbot.settings" DJANGO_ENV="test" pytest --migrations
14
+ CI_RUN =cd intbot && DJANGO_SETTINGS_MODULE="intbot.settings" DJANGO_ENV="ci"
14
15
15
16
# Deployment
16
17
DEPLOY_CMD =cd deploy && uvx --from "ansible-core" ansible-playbook -i hosts.yml
@@ -114,11 +115,11 @@ in-container/manage:
114
115
in-container/tests :
115
116
$(CONTAINER_TEST_CMD ) -vvv
116
117
117
- in-container /lint :
118
- cd intbot && ruff check .
118
+ ci /lint :
119
+ $( CI_RUN ) ruff check .
119
120
120
- in-container /type-check :
121
- cd intbot && mypy intbot
121
+ ci /type-check :
122
+ $( CI_RUN ) mypy intbot
122
123
123
124
124
125
# Docker management targets
@@ -134,8 +135,8 @@ docker/run/tests:
134
135
$(DOCKER_RUN ) make in-container/tests
135
136
136
137
docker/run/lint :
137
- $(DOCKER_RUN ) make in-container /lint
138
- $(DOCKER_RUN ) make in-container /type-check
138
+ $(DOCKER_RUN ) make ci /lint
139
+ $(DOCKER_RUN ) make ci /type-check
139
140
140
141
141
142
# Deploymenet targets
You can’t perform that action at this time.
0 commit comments