Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
grady
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan Maximilian Michal
grady
Commits
52288920
Commit
52288920
authored
4 years ago
by
Thilo Wischmeyer
Browse files
Options
Downloads
Patches
Plain Diff
Made makefile more readable and autodetect if frontend needs to be rebuilt
parent
d81f7c51
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!255
Refactor makefile
Pipeline
#159326
passed
4 years ago
Stage: build
Stage: test
Changes
1
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Makefile
+13
-6
13 additions, 6 deletions
Makefile
with
13 additions
and
6 deletions
Makefile
+
13
−
6
View file @
52288920
APP_LIST
?=
core grady util
APP_LIST
?=
core grady util
DB_NAME
=
postgres
DB_NAME
=
postgres
.PHONY
:
run install migrations-check isort isort-check test
.ONESHELL
:
.PHONY
:
run install migrations-check isort isort-check test teste2e
run
:
run
:
python manage.py runserver 0.0.0.0:8000
python manage.py runserver 0.0.0.0:8000
...
@@ -21,14 +23,19 @@ migrate:
...
@@ -21,14 +23,19 @@ migrate:
test
:
test
:
pytest
--ds
=
grady.settings core/tests
pytest
--ds
=
grady.settings core/tests
teste2e
:
frontend/dist
:
$(shell find frontend/src -type f)
cd
frontend
&&
yarn build
&&
cp
dist/index.html ../core/templates
&&
cd
..
&&
python util/format_index.py
&&
python manage.py collectstatic
--no-input
&&
HEADLESS_TESTS
=
$(
headless
)
pytest
--ds
=
grady.settings
$(
path
);
git checkout core/templates/index.html
yarn
--cwd
frontend build
teste2e-nc
:
cp
frontend/dist/index.html ./core/templates
&&
python util/format_index.py
&&
python manage.py collectstatic
--no-input
&&
HEADLESS_TESTS
=
$(
headless
)
pytest
--ds
=
grady.settings
$(
path
);
git checkout core/templates/index.html
teste2e
:
frontend/dist
set
-e
cp
frontend/dist/index.html core/templates
trap
"git checkout core/templates/index.html"
EXIT
python util/format_index.py
python manage.py collectstatic
--no-input
HEADLESS_TESTS
=
$(
headless
)
pytest
--ds
=
grady.settings
$(
path
)
coverage
:
coverage
:
set
-e
DJANGO_SETTINGS_MODULE
=
grady.settings pytest
--cov
DJANGO_SETTINGS_MODULE
=
grady.settings pytest
--cov
coverage html
coverage html
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment