Skip to content

Commit

Permalink
Merge pull request #240 from theupdateframework/require-faketime-to-m…
Browse files Browse the repository at this point in the history
…ake-dev

Makefile: Require faketime in "make dev"
  • Loading branch information
jku authored Nov 28, 2024
2 parents 921b38f + 70f3018 commit 117933c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
cache: "pip"

- name: Install lint dependencies
run: make dev
run: make env/pyvenv.cfg

- name: Run linters
run: make lint
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ env/pyvenv.cfg: pyproject.toml
./env/bin/python -m pip install -e .[lint]

.PHONY: dev
dev: env/pyvenv.cfg
dev: faketime env/pyvenv.cfg

.PHONY: test-all
test-all: test-python-tuf test-go-tuf

lint_dirs = tuf_conformance clients/python-tuf
lint: dev
lint: env/pyvenv.cfg
./env/bin/ruff format --diff $(lint_dirs)
./env/bin/ruff check $(lint_dirs)
./env/bin/mypy $(lint_dirs)

fix: dev
fix: env/pyvenv.cfg
./env/bin/ruff format $(lint_dirs)
./env/bin/ruff check --fix $(lint_dirs)

Expand All @@ -48,7 +48,7 @@ fix: dev
#########################

PHONY: test-python-tuf
test-python-tuf: dev faketime
test-python-tuf: dev
./env/bin/pytest tuf_conformance \
--entrypoint "./env/bin/python ./clients/python-tuf/python_tuf.py" \
--repository-dump-dir $(DUMP_DIR)
Expand All @@ -59,7 +59,7 @@ test-python-tuf: dev faketime
#########################

PHONY: test-go-tuf
test-go-tuf: dev build-go-tuf faketime
test-go-tuf: dev build-go-tuf
./env/bin/pytest tuf_conformance \
--entrypoint "./clients/go-tuf/go-tuf" \
--repository-dump-dir $(DUMP_DIR)
Expand Down

0 comments on commit 117933c

Please sign in to comment.