From 6bde7764058bf47fae82446a10b48e8f1cd275e7 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Tue, 30 Jul 2024 11:35:47 -0600 Subject: [PATCH] Update workflows --- .github/workflows/misc_0.yml | 12 +-- .github/workflows/test_1.yml | 156 +++++++++++++++++++++++++++++++---- 2 files changed, 147 insertions(+), 21 deletions(-) diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml index 7881144aa9..85ded7462d 100644 --- a/.github/workflows/misc_0.yml +++ b/.github/workflows/misc_0.yml @@ -31,7 +31,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e spellcheck -- -ra + run: tox -e spellcheck docker-tests: name: docker-tests @@ -49,7 +49,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e docker-tests -- -ra + run: tox -e docker-tests docs: name: docs @@ -67,7 +67,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e docs -- -ra + run: tox -e docs generate: name: generate @@ -85,7 +85,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e generate -- -ra + run: tox -e generate - name: Check workflows are up to date run: git diff --exit-code || (echo 'Generated code is out of date, run "tox -e generate" and commit the changes in this PR.' && exit 1) @@ -106,7 +106,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e generate-workflows -- -ra + run: tox -e generate-workflows - name: Check workflows are up to date run: git diff --exit-code || (echo 'Generated workflows are out of date, run "tox -e generate-workflows" and commit the changes in this PR.' && exit 1) @@ -127,4 +127,4 @@ jobs: run: pip install tox - name: Run tests - run: tox -e shellcheck -- -ra + run: tox -e shellcheck diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 55f56a0716..6ead6d3a8d 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -861,8 +861,8 @@ jobs: - name: Run tests run: tox -e pypy3-test-instrumentation-wsgi -- -ra - py38-test-instrumentation-grpc_ubuntu-latest: - name: instrumentation-grpc 3.8 Ubuntu + py38-test-instrumentation-grpc-0_ubuntu-latest: + name: instrumentation-grpc-0 3.8 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -877,10 +877,28 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py38-test-instrumentation-grpc -- -ra + run: tox -e py38-test-instrumentation-grpc-0 -- -ra - py39-test-instrumentation-grpc_ubuntu-latest: - name: instrumentation-grpc 3.9 Ubuntu + py38-test-instrumentation-grpc-1_ubuntu-latest: + name: instrumentation-grpc-1 3.8 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-instrumentation-grpc-1 -- -ra + + py39-test-instrumentation-grpc-0_ubuntu-latest: + name: instrumentation-grpc-0 3.9 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -895,10 +913,46 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py39-test-instrumentation-grpc -- -ra + run: tox -e py39-test-instrumentation-grpc-0 -- -ra - py310-test-instrumentation-grpc_ubuntu-latest: - name: instrumentation-grpc 3.10 Ubuntu + py39-test-instrumentation-grpc-1_ubuntu-latest: + name: instrumentation-grpc-1 3.9 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.9 + uses: actions/setup-python@v5 + with: + python-version: "3.9" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py39-test-instrumentation-grpc-1 -- -ra + + py310-test-instrumentation-grpc-0_ubuntu-latest: + name: instrumentation-grpc-0 3.10 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py310-test-instrumentation-grpc-0 -- -ra + + py310-test-instrumentation-grpc-1_ubuntu-latest: + name: instrumentation-grpc-1 3.10 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -913,10 +967,10 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py310-test-instrumentation-grpc -- -ra + run: tox -e py310-test-instrumentation-grpc-1 -- -ra - py311-test-instrumentation-grpc_ubuntu-latest: - name: instrumentation-grpc 3.11 Ubuntu + py311-test-instrumentation-grpc-0_ubuntu-latest: + name: instrumentation-grpc-0 3.11 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -931,10 +985,46 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py311-test-instrumentation-grpc -- -ra + run: tox -e py311-test-instrumentation-grpc-0 -- -ra - py312-test-instrumentation-grpc_ubuntu-latest: - name: instrumentation-grpc 3.12 Ubuntu + py311-test-instrumentation-grpc-1_ubuntu-latest: + name: instrumentation-grpc-1 3.11 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: "3.11" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py311-test-instrumentation-grpc-1 -- -ra + + py312-test-instrumentation-grpc-0_ubuntu-latest: + name: instrumentation-grpc-0 3.12 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py312-test-instrumentation-grpc-0 -- -ra + + py312-test-instrumentation-grpc-1_ubuntu-latest: + name: instrumentation-grpc-1 3.12 Ubuntu runs-on: ubuntu-latest steps: - name: Checkout repo @ SHA - ${{ github.sha }} @@ -949,7 +1039,43 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py312-test-instrumentation-grpc -- -ra + run: tox -e py312-test-instrumentation-grpc-1 -- -ra + + pypy3-test-instrumentation-grpc-0_ubuntu-latest: + name: instrumentation-grpc-0 pypy-3.8 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python pypy-3.8 + uses: actions/setup-python@v5 + with: + python-version: "pypy-3.8" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e pypy3-test-instrumentation-grpc-0 -- -ra + + pypy3-test-instrumentation-grpc-1_ubuntu-latest: + name: instrumentation-grpc-1 pypy-3.8 Ubuntu + runs-on: ubuntu-latest + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python pypy-3.8 + uses: actions/setup-python@v5 + with: + python-version: "pypy-3.8" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e pypy3-test-instrumentation-grpc-1 -- -ra py38-test-instrumentation-sqlalchemy-1_ubuntu-latest: name: instrumentation-sqlalchemy-1 3.8 Ubuntu