Skip to content

Fix Makefile CI functionality #160

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

Merged
Nava-JoshLong merged 4 commits into from
Jun 9, 2023
Merged

Fix Makefile CI functionality #160

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80dd81b
Add missing Makefile line
Nava-JoshLong Apr 19, 2023
3f12509
Update Makefile
Nava-JoshLong May 25, 2023
99c68fc
Merge branch 'main' into fix-missing-makefile-command
Nava-JoshLong May 25, 2023
acc0204
Update Makefile
Nava-JoshLong May 25, 2023
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
14 changes: 10 additions & 4 deletions app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,19 @@ APP_NAME := main-app
# in the event JSON is output from a process we don't log.
DECODE_LOG := 2>&1 | python3 -u src/logging/util/decodelog.py

# Required for CI flags below to work properly
SHELL = /bin/bash -o pipefail

# A few commands need adjustments if they're run in CI, specify those here
# TODO - when CI gets hooked up, actually test this.
# Make sure the path of the file mirrors the path to the app, or these flags will
# not work as expected in GitHub
## FLAKE8_FORMAT will show any findings in the "Files Changed" tab of the PR
## MYPY_POSTPROC will show any findings in the "Files Changed" tab of the PR
ifdef CI
DOCKER_EXEC_ARGS := -T -e CI -e PYTEST_ADDOPTS="--color=yes"
FLAKE8_FORMAT := '::warning file=src/%(path)s,line=%(row)d,col=%(col)d::%(path)s:%(row)d:%(col)d: %(code)s %(text)s'
FLAKE8_FORMAT := '::warning file=app/%(path)s,line=%(row)d,col=%(col)d::%(path)s:%(row)d:%(col)d: %(code)s %(text)s'
MYPY_FLAGS := --no-pretty
MYPY_POSTPROC := | perl -pe "s/^(.+):(\d+):(\d+): error: (.*)/::warning file=src\/\1,line=\2,col=\3::\4/"
MYPY_POSTPROC := | perl -pe "s/^(.+):(\d+):(\d+): error: (.*)/::warning file=app\/\1,line=\2,col=\3::\4/"
else
FLAKE8_FORMAT := default
endif
Expand Down Expand Up @@ -183,7 +189,7 @@ cmd-user-create-csv: ## Create a CSV of the useres in the database (Run `make cl
$(FLASK_CMD) user create-csv $(args)

# Set init-db as pre-requisite since there seems to be a race condition
# where the DB can't yet receive connections if it's starting from a
# where the DB can't yet receive connections if it's starting from a
# clean state (e.g. after make stop, make clean-volumes, make openapi-spec)
openapi-spec: init-db ## Generate OpenAPI spec
$(FLASK_CMD) spec --format yaml --output ./openapi.generated.yml
Expand Down