Skip to content

Update make commands to set no-TTY flag #376

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
earmenda merged 4 commits into from
Feb 25, 2022
Merged

Update make commands to set no-TTY flag #376

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85f5eed
Update make commands to set no-TTY flag
Feb 23, 2022
d05a96d
Test a unit test failure fails CI
Feb 23, 2022
22a1c71
Fix test to confirm test success prints output
Feb 23, 2022
5fe84fd
Only set no-TTY when running within github actions
Feb 24, 2022
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
18 changes: 12 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,15 @@ IMAGE := $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
IMAGE_LOCAL := $(REGISTRY)/$(IMAGE_NAME):local
IMAGE_LATEST := $(REGISTRY)/$(IMAGE_NAME):latest

# Disable TTY to perserve output within Github Actions logs
# CI env variable is always set to true in Github Actions
ifeq "$(CI)" "true"
CI_ARGS:=--no-TTY
endif

# Run in Compose
RUN = docker compose run --rm $(IMAGE_NAME)
RUN_NO_DEPS = docker compose run --no-deps --rm $(IMAGE_NAME)
RUN = docker compose run --rm $(CI_ARGS) $(IMAGE_NAME)
RUN_NO_DEPS = docker compose run --no-deps --rm $(CI_ARGS) $(IMAGE_NAME)

.PHONY: help
help:
Expand Down Expand Up @@ -113,7 +119,7 @@ pytest-unit:

pytest-integration:
@docker compose -f docker-compose.yml -f docker-compose.integration-tests.yml up -d $(IMAGE_NAME)
@docker compose run --rm $(IMAGE_NAME) \
@docker compose run --rm $(CI_ARGS) $(IMAGE_NAME) \
pytest -x -m integration
@make teardown

Expand All @@ -125,7 +131,7 @@ pytest-external:
-e AWS_ACCESS_KEY_ID \
-e AWS_SECRET_ACCESS_KEY \
-e AWS_DEFAULT_REGION \
--rm $(IMAGE_NAME) \
--rm $(CI_ARGS) $(IMAGE_NAME) \
pytest -x -m external
@make teardown

Expand Down Expand Up @@ -155,11 +161,11 @@ teardown:

.PHONY: docs-build
docs-build: build-local
@docker compose run --rm $(IMAGE_NAME) \
@docker compose run --rm $(CI_ARGS) $(IMAGE_NAME) \
python generate_docs.py ../docs/fides/docs/

.PHONY: docs-serve
docs-serve: docs-build
@docker compose build docs
@docker compose run --rm --service-ports docs \
@docker compose run --rm --service-ports $(CI_ARGS) docs \
/bin/bash -c "pip install -e /fidesctl && mkdocs serve --dev-addr=0.0.0.0:8000"