Skip to content

Commit a256eca

Browse files
arkid15rarkid15r
committed
Refactor Makefiles
1 parent d773d15 commit a256eca

File tree

3 files changed

+122
-108
lines changed

3 files changed

+122
-108
lines changed

Diff for: ‎Makefile

+9-108
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,21 @@
1+
include backend/Makefile
2+
include frontend/Makefile
3+
14
build:
25
@docker compose build
36

4-
check:
5-
@pre-commit run -a
6-
cd frontend && npm run lint && npm run format
7-
8-
clear-cache:
9-
@CMD="poetry run python manage.py clear_cache" $(MAKE) exec-backend-command
10-
11-
collect-static:
12-
@CMD="poetry run python manage.py collectstatic --noinput" $(MAKE) exec-backend-command
13-
14-
django-shell:
15-
@CMD="poetry run python manage.py shell" $(MAKE) exec-backend-command-it
16-
17-
dump-data:
18-
@CMD="poetry run python manage.py dumpdata github owasp --indent=2" $(MAKE) exec-backend-command > data/nest.json
19-
20-
enrich-data: github-enrich-issues owasp-enrich-chapters owasp-enrich-committees owasp-enrich-projects
21-
22-
exec-backend-command:
23-
@docker exec -i nest-backend $(CMD)
24-
25-
exec-backend-command-it:
26-
@docker exec -it nest-backend $(CMD) 2>/dev/null
27-
28-
github-enrich-issues:
29-
@echo "Enriching GitHub issues"
30-
@CMD="poetry run python manage.py github_enrich_issues" $(MAKE) exec-backend-command
31-
32-
github-update-owasp-organization:
33-
@echo "Updating OWASP GitHub organization"
34-
@CMD="poetry run python manage.py github_update_owasp_organization" $(MAKE) exec-backend-command
35-
36-
github-update-project-related-repositories:
37-
@echo "Updating OWASP project related GitHub repositories"
38-
@CMD="poetry run python manage.py github_update_project_related_repositories" $(MAKE) exec-backend-command
39-
40-
index-data:
41-
@echo "Indexing Nest data"
42-
@CMD="poetry run python manage.py algolia_reindex" $(MAKE) exec-backend-command
43-
@CMD="poetry run python manage.py algolia_update_synonyms" $(MAKE) exec-backend-command
44-
45-
load-data:
46-
@CMD="poetry run python manage.py load_data" $(MAKE) exec-backend-command
47-
48-
merge-migrations:
49-
@CMD="poetry run python manage.py makemigrations --merge" $(MAKE) exec-backend-command
50-
51-
migrate:
52-
@CMD="poetry run python manage.py migrate" $(MAKE) exec-backend-command
7+
check: \
8+
pre-commit \
9+
format-frontend-code \
10+
lint-frontend-code
5311

54-
migrations:
55-
@CMD="poetry run python manage.py makemigrations" $(MAKE) exec-backend-command
56-
57-
owasp-aggregate-projects:
58-
@echo "Aggregating OWASP projects"
59-
@CMD="poetry run python manage.py owasp_aggregate_projects" $(MAKE) exec-backend-command
60-
61-
owasp-enrich-chapters:
62-
@echo "Enriching OWASP chapters"
63-
@CMD="poetry run python manage.py owasp_enrich_chapters" $(MAKE) exec-backend-command
64-
65-
owasp-enrich-committees:
66-
@echo "Enriching OWASP committees"
67-
@CMD="poetry run python manage.py owasp_enrich_committees" $(MAKE) exec-backend-command
68-
69-
owasp-enrich-projects:
70-
@echo "Enriching OWASP projects"
71-
@CMD="poetry run python manage.py owasp_enrich_projects" $(MAKE) exec-backend-command
72-
73-
owasp-scrape-chapters:
74-
@echo "Scraping OWASP site chapters data"
75-
@CMD="poetry run python manage.py owasp_scrape_chapters" $(MAKE) exec-backend-command
76-
77-
owasp-scrape-committees:
78-
@echo "Scraping OWASP site committees data"
79-
@CMD="poetry run python manage.py owasp_scrape_committees" $(MAKE) exec-backend-command
80-
81-
owasp-scrape-projects:
82-
@echo "Scraping OWASP site projects data"
83-
@CMD="poetry run python manage.py owasp_scrape_projects" $(MAKE) exec-backend-command
84-
85-
poetry-update:
86-
@CMD="poetry update" $(MAKE) exec-backend-command
87-
88-
purge-data:
89-
@CMD="poetry run python manage.py purge_data" $(MAKE) exec-backend-command
12+
pre-commit:
13+
@pre-commit run -a
9014

9115
run:
9216
@docker compose build
9317
@docker compose up
9418

95-
setup:
96-
@CMD="poetry run python manage.py createsuperuser" $(MAKE) exec-backend-command-it
97-
98-
shell:
99-
@CMD="/bin/bash" $(MAKE) exec-backend-command-it
100-
101-
sync: update-data enrich-data index-data clear-cache
102-
10319
test: \
10420
test-backend \
10521
test-frontend
106-
107-
test-backend:
108-
@docker build -f backend/Dockerfile.test backend -t nest-backend-test
109-
@docker run -e DJANGO_CONFIGURATION=Test nest-backend-test poetry run pytest
110-
111-
test-frontend:
112-
@cd frontend && npm run test
113-
114-
update-data: \
115-
github-update-owasp-organization \
116-
owasp-scrape-chapters \
117-
owasp-scrape-committees \
118-
owasp-scrape-projects \
119-
github-update-project-related-repositories \
120-
owasp-aggregate-projects

Diff for: ‎backend/Makefile

+102
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
exec-backend-command:
2+
@docker exec -i nest-backend $(CMD)
3+
4+
exec-backend-command-it:
5+
@docker exec -it nest-backend $(CMD) 2>/dev/null
6+
7+
clear-cache:
8+
@CMD="poetry run python manage.py clear_cache" $(MAKE) exec-backend-command
9+
10+
collect-static:
11+
@CMD="poetry run python manage.py collectstatic --noinput" $(MAKE) exec-backend-command
12+
13+
django-shell:
14+
@CMD="poetry run python manage.py shell" $(MAKE) exec-backend-command-it
15+
16+
dump-data:
17+
@CMD="poetry run python manage.py dumpdata github owasp --indent=2" $(MAKE) exec-backend-command > data/nest.json
18+
19+
enrich-data: github-enrich-issues owasp-enrich-chapters owasp-enrich-committees owasp-enrich-projects
20+
21+
github-enrich-issues:
22+
@echo "Enriching GitHub issues"
23+
@CMD="poetry run python manage.py github_enrich_issues" $(MAKE) exec-backend-command
24+
25+
github-update-owasp-organization:
26+
@echo "Updating OWASP GitHub organization"
27+
@CMD="poetry run python manage.py github_update_owasp_organization" $(MAKE) exec-backend-command
28+
29+
github-update-project-related-repositories:
30+
@echo "Updating OWASP project related GitHub repositories"
31+
@CMD="poetry run python manage.py github_update_project_related_repositories" $(MAKE) exec-backend-command
32+
33+
index-data:
34+
@echo "Indexing Nest data"
35+
@CMD="poetry run python manage.py algolia_reindex" $(MAKE) exec-backend-command
36+
@CMD="poetry run python manage.py algolia_update_synonyms" $(MAKE) exec-backend-command
37+
38+
load-data:
39+
@CMD="poetry run python manage.py load_data" $(MAKE) exec-backend-command
40+
41+
merge-migrations:
42+
@CMD="poetry run python manage.py makemigrations --merge" $(MAKE) exec-backend-command
43+
44+
migrate:
45+
@CMD="poetry run python manage.py migrate" $(MAKE) exec-backend-command
46+
47+
migrations:
48+
@CMD="poetry run python manage.py makemigrations" $(MAKE) exec-backend-command
49+
50+
owasp-aggregate-projects:
51+
@echo "Aggregating OWASP projects"
52+
@CMD="poetry run python manage.py owasp_aggregate_projects" $(MAKE) exec-backend-command
53+
54+
owasp-enrich-chapters:
55+
@echo "Enriching OWASP chapters"
56+
@CMD="poetry run python manage.py owasp_enrich_chapters" $(MAKE) exec-backend-command
57+
58+
owasp-enrich-committees:
59+
@echo "Enriching OWASP committees"
60+
@CMD="poetry run python manage.py owasp_enrich_committees" $(MAKE) exec-backend-command
61+
62+
owasp-enrich-projects:
63+
@echo "Enriching OWASP projects"
64+
@CMD="poetry run python manage.py owasp_enrich_projects" $(MAKE) exec-backend-command
65+
66+
owasp-scrape-chapters:
67+
@echo "Scraping OWASP site chapters data"
68+
@CMD="poetry run python manage.py owasp_scrape_chapters" $(MAKE) exec-backend-command
69+
70+
owasp-scrape-committees:
71+
@echo "Scraping OWASP site committees data"
72+
@CMD="poetry run python manage.py owasp_scrape_committees" $(MAKE) exec-backend-command
73+
74+
owasp-scrape-projects:
75+
@echo "Scraping OWASP site projects data"
76+
@CMD="poetry run python manage.py owasp_scrape_projects" $(MAKE) exec-backend-command
77+
78+
poetry-update:
79+
@CMD="poetry update" $(MAKE) exec-backend-command
80+
81+
purge-data:
82+
@CMD="poetry run python manage.py purge_data" $(MAKE) exec-backend-command
83+
84+
setup:
85+
@CMD="poetry run python manage.py createsuperuser" $(MAKE) exec-backend-command-it
86+
87+
shell-backend:
88+
@CMD="/bin/bash" $(MAKE) exec-backend-command-it
89+
90+
sync: update-data enrich-data index-data clear-cache
91+
92+
test-backend:
93+
@docker build -f backend/Dockerfile.test backend -t nest-backend-test
94+
@docker run -e DJANGO_CONFIGURATION=Test nest-backend-test poetry run pytest
95+
96+
update-data: \
97+
github-update-owasp-organization \
98+
owasp-scrape-chapters \
99+
owasp-scrape-committees \
100+
owasp-scrape-projects \
101+
github-update-project-related-repositories \
102+
owasp-aggregate-projects

Diff for: ‎frontend/Makefile

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
exec-frontend-command:
2+
@docker exec -i nest-frontend $(CMD)
3+
4+
format-frontend-code:
5+
@CMD="npm run format" $(MAKE) exec-frontend-command
6+
7+
lint-frontend-code:
8+
@CMD="npm run lint" $(MAKE) exec-frontend-command
9+
10+
test-frontend:
11+
@cd frontend && npm run test

0 commit comments

Comments
 (0)