Skip to content

Fixing outdated or broken make targets #948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Janmtbehrens wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixing outdated or broken make targets #948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
override SERVICE=auth
override DEV_DC=CONTEXT="dev" docker compose -f docker-compose.dev.yml
override TEST_DC=CONTEXT="tests" docker compose -f docker-compose.dev.yml

# Build images for different contexts
Expand Down Expand Up @@ -57,10 +58,10 @@ stop-test-ci:
# Cleanup

run-cleanup:
make dev-detached ARGS="auth"
make dev-exec ARGS="auth ./wait-for.sh auth:9004"
make dev-exec ARGS="auth npm run cleanup"
make dev-stop
$(DEV_DC) up -d
$(DEV_DC) exec auth ./wait-for.sh auth:9004
$(DEV_DC) exec auth npm run cleanup
$(DEV_DC) down

########################## Deprecation List ##########################

Expand Down
16 changes: 8 additions & 8 deletions dev/run-lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ then
# Container Mode
eval "$DC_AUTH npm run lint-check"
eval "$DC_AUTH npm run prettify-check"
eval "$DC_PIP -T auth black --check --diff authlib/ tests/"
eval "$DC_PIP -T auth isort --check-only --diff authlib/ tests/"
eval "$DC_PIP -T auth flake8 authlib/ tests/"
eval "$DC_PIP -T auth mypy authlib/ tests/"
eval "$DC_PIP -T auth black --check --diff osauthlib/ tests/"
eval "$DC_PIP -T auth isort --check-only --diff osauthlib/ tests/"
eval "$DC_PIP -T auth flake8 osauthlib/ tests/"
eval "$DC_PIP -T auth mypy osauthlib/ tests/"
else
{
cd ./auth || exit 1
Expand All @@ -52,9 +52,9 @@ else
npm run prettify-check

cd ./libraries/pip-auth || exit 1
black --check --diff authlib/ tests/
isort --check-only --diff authlib/ tests/
flake8 authlib/ tests/
mypy authlib/ tests/
black --check --diff osauthlib/ tests/
isort --check-only --diff osauthlib/ tests/
flake8 osauthlib/ tests/
mypy osauthlib/ tests/
}
fi