Skip to content

Commit 5be6e9b

Browse files
committed
add CI_RUN
1 parent 51ed4a8 commit 5be6e9b

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.github/workflows/build_test_and_lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
4141
- name: Run Docker container for lint
4242
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
4545
4646
services:
4747
postgres:

Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ DOCKER_RUN=docker run --add-host=host.internal:host-gateway -e DJANGO_ENV="test"
1111
MANAGE=cd intbot && ./manage.py
1212
# In container we run with migrations
1313
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"
1415

1516
# Deployment
1617
DEPLOY_CMD=cd deploy && uvx --from "ansible-core" ansible-playbook -i hosts.yml
@@ -114,11 +115,11 @@ in-container/manage:
114115
in-container/tests:
115116
$(CONTAINER_TEST_CMD) -vvv
116117

117-
in-container/lint:
118-
cd intbot && ruff check .
118+
ci/lint:
119+
$(CI_RUN) ruff check .
119120

120-
in-container/type-check:
121-
cd intbot && mypy intbot
121+
ci/type-check:
122+
$(CI_RUN) mypy intbot
122123

123124

124125
# Docker management targets
@@ -134,8 +135,8 @@ docker/run/tests:
134135
$(DOCKER_RUN) make in-container/tests
135136

136137
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
139140

140141

141142
# Deploymenet targets

0 commit comments

Comments
 (0)