diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 545ea4302..7d80e80af 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,48 +74,6 @@ jobs: --health-interval 10s --health-timeout 5s --health-retries 5 -# redis-B: -# image: redis:${{ matrix.redis }} -# ports: -# # Maps port 6379 on service container to the host -# - 6379:26379 -# # Set health checks to wait until redis has started -# options: >- -# --health-cmd "redis-cli ping" -# --health-interval 10s -# --health-timeout 5s -# --health-retries 5 -# redis-replica-1: -# image: bitnami/redis:${{ matrix.redis }} -# env: -# REDIS_REPLICATION_MODE: slave -# REDIS_MASTER_HOST: localhost -# REDIS_MASTER_PORT_NUMBER: 6379 -# ports: -# # Maps port 6379 on service container to the host -# - 6379:16379 -# # Set health checks to wait until redis has started -# options: >- -# --health-cmd "redis-cli ping" -# --health-interval 10s -# --health-timeout 5s -# --health-retries 5 -# redis-replica-2: -# image: bitnami/redis:${{ matrix.redis }} -# env: -# REDIS_REPLICATION_MODE: slave -# REDIS_MASTER_HOST: localhost -# REDIS_MASTER_PORT_NUMBER: 6379 -# ports: -# # Maps port 6379 on service container to the host -# - 6379:26379 -# # Set health checks to wait until redis has started -# options: >- -# --health-cmd "redis-cli ping" -# --health-interval 10s -# --health-timeout 5s -# --health-retries 5 - runs-on: ${{ matrix.os }} timeout-minutes: 15 env: @@ -162,116 +120,6 @@ jobs: env_vars: OS fail_ci_if_error: false - test-windows: - name: Test Windows - needs: lint - strategy: - matrix: - os: [windows-latest] - pyver: [3.6, 3.7, 3.8, 3.9, pypy3] - uvloop: [no-uvloop] - redis: [5.0.10, 6.0.10] - fail-fast: false - runs-on: ${{ matrix.os }} - continue-on-error: true - timeout-minutes: 15 - services: - redis-main: - image: redis:${{ matrix.redis }} - env: - REDIS_REPLICATION_MODE: master - ports: - # Maps port 6379 on service container to the host - - 6379:6379 - # Set health checks to wait until redis has started - options: >- - --health-cmd "redis-cli ping" - --health-interval 10s - --health-timeout 5s - --health-retries 5 -# redis-replica-1: -# image: bitnami/redis:${{ matrix.redis }} -# env: -# REDIS_REPLICATION_MODE: slave -# REDIS_MASTER_HOST: localhost -# REDIS_MASTER_PORT_NUMBER: 6379 -# ports: -# # Maps port 6379 on service container to the host -# - 6379:16379 -# # Set health checks to wait until redis has started -# options: >- -# --health-cmd "redis-cli ping" -# --health-interval 10s -# --health-timeout 5s -# --health-retries 5 -# redis-replica-2: -# image: bitnami/redis:${{ matrix.redis }} -# env: -# REDIS_REPLICATION_MODE: slave -# REDIS_MASTER_HOST: localhost -# REDIS_MASTER_PORT_NUMBER: 6379 -# ports: -# # Maps port 6379 on service container to the host -# - 6379:26379 -# # Set health checks to wait until redis has started -# options: >- -# --health-cmd "redis-cli ping" -# --health-interval 10s -# --health-timeout 5s -# --health-retries 5 - env: - OS: ${{ matrix.os }} - INSTALL_DIR: ${{ github.workspace }}/redis - PYTEST_ADDOPTS: --${{ matrix.uvloop }} - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Setup Python ${{ matrix.pyver }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.pyver }} - - name: Cache Redis server - uses: actions/cache@v2 - if: ${{ startsWith(runner.os, 'Windows') }} - with: - key: pip-ci-${{ runner.os }}-${{ hashFiles('**/requirements.txt') }} - path: ${{ github.workspace }}\redis - restore-keys: | - redis-ci-${{ runner.os }} - - name: Install Redis Server - run: | - choco install redis-64 --version 3.0.503 - - name: Get pip cache dir - id: pip-cache - run: | - echo "::set-output name=dir::$(pip cache dir)" # - name: Cache - - name: Cache PyPI - uses: actions/cache@v2.1.4 - with: - key: pip-ci-${{ runner.os }}-${{ matrix.pyver }}-${{ hashFiles('**/requirements.txt') }} - path: ${{ steps.pip-cache.outputs.dir }} - restore-keys: | - pip-ci-${{ runner.os }}-${{ matrix.pyver }} - - name: Install dependencies - uses: py-actions/py-dependency-install@v2 - with: - path: tests/requirements.txt - - name: Install Self (windows) - if: ${{ startsWith(runner.os, 'Windows') }} - run: | - pip install -e . -c tests\requirements.txt - - name: Run unittests - if: ${{ startsWith(runner.os, 'Windows') }} - run: | - python -m pytest -sv --cov --cov-report=xml --junitxml=coverage.xml - - name: Upload coverage - uses: codecov/codecov-action@v1 - with: - file: ./coverage.xml - flags: unit - env_vars: OS - fail_ci_if_error: false - # deploy: # name: Deploy # runs-on: ubuntu-latest