diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index fbbcba0..189c084 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -26,24 +26,27 @@ jobs: python-version: ${{ matrix.python-version }} - name: Run PostgreSQL - run: make run-db - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements/requirements-test-${{ matrix.python-version }}.txt -r requirements/requirements-${{ matrix.python-version }}.txt - - - name: Test with pytest run: | - pytest --cov-report=xml + type -P podman docker + builtin type -P podman docker + make run-db - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v4 - with: - env_vars: OS,PYTHON - file: ./coverage.xml - fail_ci_if_error: true - flags: unittests - name: codecov-umbrella - token: ${{ secrets.CODECOV_TOKEN }} - verbose: true +# - name: Install dependencies +# run: | +# python -m pip install --upgrade pip +# pip install -r requirements/requirements-test-${{ matrix.python-version }}.txt -r requirements/requirements-${{ matrix.python-version }}.txt +# +# - name: Test with pytest +# run: | +# pytest --cov-report=xml +# +# - name: Upload coverage to Codecov +# uses: codecov/codecov-action@v4 +# with: +# env_vars: OS,PYTHON +# file: ./coverage.xml +# fail_ci_if_error: true +# flags: unittests +# name: codecov-umbrella +# token: ${{ secrets.CODECOV_TOKEN }} +# verbose: true diff --git a/Makefile b/Makefile index 86fb774..809facc 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,10 @@ ifeq ($(OS), Darwin) CONTAINER_RUNTIMES = docker podman endif -CONTAINER_RUNTIME ?= $(shell type -P $(CONTAINER_RUNTIMES) 2>&1 | head -n 1) +CONTAINER_RUNTIME ?= $(shell type -hello $(CONTAINER_RUNTIMES) | head -n 1) +$(info OS is $(OS)) +$(info CONTAINER_RUNTIMES is $(CONTAINER_RUNTIMES)) +$(info CONTAINER_RUNTIME is $(CONTAINER_RUNTIME)) default: install