diff --git a/.github/workflows/contrib_0.yml b/.github/workflows/contrib_0.yml index 2763cfc0212..0dbd18c11c0 100644 --- a/.github/workflows/contrib_0.yml +++ b/.github/workflows/contrib_0.yml @@ -8,6 +8,7 @@ on: branches-ignore: - 'release/*' pull_request: + env: CORE_REPO_SHA: ${{ github.sha }} CONTRIB_REPO_SHA: main @@ -631,8 +632,8 @@ jobs: - name: Run tests run: tox -e py38-test-instrumentation-falcon-2 -- -ra - py38-test-instrumentation-fastapi: - name: instrumentation-fastapi + py38-test-instrumentation-fastapi-main: + name: instrumentation-fastapi-main runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -657,7 +658,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py38-test-instrumentation-fastapi -- -ra + run: tox -e py38-test-instrumentation-fastapi-main -- -ra py38-test-instrumentation-fastapi-slim: name: instrumentation-fastapi-slim @@ -1023,8 +1024,36 @@ jobs: - name: Run tests run: tox -e py38-test-exporter-prometheus-remote-write -- -ra - py38-test-instrumentation-mysql: - name: instrumentation-mysql + py38-test-instrumentation-mysql-0: + name: instrumentation-mysql-0 + runs-on: ubuntu-latest + steps: + - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python-contrib + ref: ${{ env.CONTRIB_REPO_SHA }} + + - name: Checkout core repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python + path: opentelemetry-python-core + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + architecture: "x64" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-instrumentation-mysql-0 -- -ra + + py38-test-instrumentation-mysql-1: + name: instrumentation-mysql-1 runs-on: ubuntu-latest steps: - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} @@ -1049,7 +1078,7 @@ jobs: run: pip install tox - name: Run tests - run: tox -e py38-test-instrumentation-mysql -- -ra + run: tox -e py38-test-instrumentation-mysql-1 -- -ra py38-test-instrumentation-mysqlclient: name: instrumentation-mysqlclient @@ -2087,6 +2116,34 @@ jobs: - name: Run tests run: tox -e py38-test-instrumentation-kafka-python -- -ra + py38-test-instrumentation-kafka-pythonng: + name: instrumentation-kafka-pythonng + runs-on: ubuntu-latest + steps: + - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python-contrib + ref: ${{ env.CONTRIB_REPO_SHA }} + + - name: Checkout core repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + with: + repository: open-telemetry/opentelemetry-python + path: opentelemetry-python-core + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: "3.8" + architecture: "x64" + + - name: Install tox + run: pip install tox + + - name: Run tests + run: tox -e py38-test-instrumentation-kafka-pythonng -- -ra + py38-test-instrumentation-confluent-kafka: name: instrumentation-confluent-kafka runs-on: ubuntu-latest diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml index db927fcfabe..00346652985 100644 --- a/.github/workflows/lint_0.yml +++ b/.github/workflows/lint_0.yml @@ -8,6 +8,7 @@ on: branches-ignore: - 'release/*' pull_request: + env: CORE_REPO_SHA: main CONTRIB_REPO_SHA: main diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml index c0db3816df9..a99b112a342 100644 --- a/.github/workflows/misc_0.yml +++ b/.github/workflows/misc_0.yml @@ -8,6 +8,7 @@ on: branches-ignore: - 'release/*' pull_request: + env: CORE_REPO_SHA: main CONTRIB_REPO_SHA: main @@ -186,6 +187,9 @@ jobs: generate-workflows: name: generate-workflows runs-on: ubuntu-latest + if: | + !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows') + && github.actor != 'opentelemetrybot' steps: - name: Checkout repo @ SHA - ${{ github.sha }} uses: actions/checkout@v4 diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml index 7cf3ebc733b..48c751e7908 100644 --- a/.github/workflows/test_0.yml +++ b/.github/workflows/test_0.yml @@ -8,6 +8,7 @@ on: branches-ignore: - 'release/*' pull_request: + env: CORE_REPO_SHA: main CONTRIB_REPO_SHA: main diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml index 174af5f10ba..892039b33ec 100644 --- a/.github/workflows/test_1.yml +++ b/.github/workflows/test_1.yml @@ -8,6 +8,7 @@ on: branches-ignore: - 'release/*' pull_request: + env: CORE_REPO_SHA: main CONTRIB_REPO_SHA: main