From e3a4e6d39ec95114e4b3942cb1c18ec221bd95da Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Thu, 15 Aug 2024 16:34:05 -0600 Subject: [PATCH] Update tox.ini contrib SHA --- .github/workflows/misc_0.yml | 3 +++ tox.ini | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml index a99b112a342..efd9f888548 100644 --- a/.github/workflows/misc_0.yml +++ b/.github/workflows/misc_0.yml @@ -145,6 +145,9 @@ jobs: public-symbols-check: name: public-symbols-check runs-on: ubuntu-latest + if: | + !contains(github.event.pull_request.labels.*.name, 'Approve Public API check') + && github.actor != 'opentelemetrybot' steps: - name: Checkout repo @ SHA - ${{ github.sha }} uses: actions/checkout@v4 diff --git a/tox.ini b/tox.ini index 23f5947c4bd..31216458fa6 100644 --- a/tox.ini +++ b/tox.ini @@ -126,7 +126,8 @@ allowlist_externals = sh setenv = ; override CONTRIB_REPO_SHA via env variable when testing other branches/commits than main ; i.e: CONTRIB_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e - CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:main} + # CONTRIB_REPO_SHA={env:CONTRIB_REPO_SHA:main} + CONTRIB_REPO_SHA=974c8a0a898f909bee8930cc9fc5717e91dcec12 CONTRIB_REPO=git+https://github.com/open-telemetry/opentelemetry-python-contrib.git@{env:CONTRIB_REPO_SHA} mypy: MYPYPATH={toxinidir}/opentelemetry-api/src/:{toxinidir}/opentelemetry-semantic-conventions/src/:{toxinidir}/opentelemetry-sdk/src/:{toxinidir}/tests/opentelemetry-test-utils/src/