diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index 4248b07..f2a532d 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -1,40 +1,40 @@ -name: Test and Lint - -on: [push] - -jobs: - build: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: ["3.10"] - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_dev.txt - - name: Start Redis container - run: | - docker run --name redis -d -p 6379:6379 redis - - name: Start Uvicorn server - run: | - SETTINGS_MODE=redis uvicorn main:app --host 127.0.0.1 --port 8000 & - sleep 10 # Wait for the server to start - - name: Run tests with pytest - run: | - SETTINGS_MODE=redis pytest -m "not long" tests - - name: Stop Uvicorn server - if: always() - run: | - pkill -f "uvicorn main:app" - - name: Stop Redis container - if: always() - run: | - docker stop redis - docker rm redis +#name: Test and Lint +# +#on: [push] +# +#jobs: +# build: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# python-version: ["3.10"] +# steps: +# - uses: actions/checkout@v4 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v3 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Install dependencies +# run: | +# python -m pip install --upgrade pip +# pip install -r requirements.txt +# pip install -r requirements_dev.txt +# - name: Start Redis container +# run: | +# docker run --name redis -d -p 6379:6379 redis +# - name: Start Uvicorn server +# run: | +# SETTINGS_MODE=redis uvicorn main:app --host 127.0.0.1 --port 8000 & +# sleep 10 # Wait for the server to start +# - name: Run tests with pytest +# run: | +# SETTINGS_MODE=redis pytest -m "not long" tests +# - name: Stop Uvicorn server +# if: always() +# run: | +# pkill -f "uvicorn main:app" +# - name: Stop Redis container +# if: always() +# run: | +# docker stop redis +# docker rm redis diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5c03e3..857826e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,31 +26,51 @@ jobs: - name: Format with Black run: | black --check . - - name: Run tests with coverage - run: | - pytest --cov=./ --cov-report=xml - coverage: - runs-on: ubuntu-latest - needs: build - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies + - name: Start Uvicorn server run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r requirements_dev.txt - - name: Run tests with coverage + SETTINGS_MODE=redis uvicorn main:app --host 127.0.0.1 --port 8000 & + sleep 10 # Wait for the server to start + - name: Run tests with pytest run: | - pytest --cov=./ --cov-report=xml - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2 - with: - files: ./coverage.xml - flags: unittests - name: codecov-umbrella - fail_ci_if_error: true + SETTINGS_MODE=redis pytest -m "not long" tests + - name: Stop Uvicorn server + if: always() + run: | + pkill -f "uvicorn main:app" + - name: Stop Redis container + if: always() + run: | + docker stop redis + docker rm redis + + +# - name: Run tests with coverage +# run: | +# pytest --cov=./ --cov-report=xml + +# +# coverage: +# runs-on: ubuntu-latest +# needs: build +# steps: +# - uses: actions/checkout@v4 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v3 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Install dependencies +# run: | +# python -m pip install --upgrade pip +# pip install -r requirements.txt +# pip install -r requirements_dev.txt +# - name: Run tests with coverage +# run: | +# pytest --cov=./ --cov-report=xml +# - name: Upload coverage to Codecov +# uses: codecov/codecov-action@v2 +# with: +# files: ./coverage.xml +# flags: unittests +# name: codecov-umbrella +# fail_ci_if_error: true