From 70d5865e43c079b1f47832702dacda1a27740e84 Mon Sep 17 00:00:00 2001 From: Sebastian Englbrecht Date: Tue, 20 Dec 2022 19:08:27 +0100 Subject: [PATCH] Sync structure of Makefile and Github Action --- .github/workflows/pull_request.yml | 2 ++ Makefile | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ae36e12f6..e792d96e0 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -97,6 +97,8 @@ jobs: - name: Build run: make - name: Run mypy + # Make sure to also update the Makefile target! run: docker run --rm --entrypoint=python3 frigate:latest -u -m mypy --config-file frigate/mypy.ini frigate - name: Run tests + # Make sure to also update the Makefile target! run: docker run --rm --entrypoint=python3 frigate:latest -u -m unittest diff --git a/Makefile b/Makefile index e648ff426..55c491cc7 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,8 @@ run: local docker run --rm --publish=5000:5000 --volume=${PWD}/config/config.yml:/config/config.yml frigate:latest run_tests: local - docker run --rm --workdir=/opt/frigate --entrypoint= frigate:latest /bin/bash -c "python3 -u -m coverage run -m unittest;python3 -m coverage report --include=frigate/*" - docker run --rm --workdir=/opt/frigate --entrypoint= frigate:latest python3 -u -m mypy --config-file frigate/mypy.ini frigate + # Make sure to also check and update the Github Action in pull_request.yml + docker run --rm --workdir=/opt/frigate --entrypoint=/bin/bash frigate:latest -c "python3 -u -m coverage run -m unittest;python3 -m coverage report --include=frigate/*" + docker run --rm --workdir=/opt/frigate --entrypoint=python3 frigate:latest -u -m mypy --config-file frigate/mypy.ini frigate .PHONY: run_tests