Update tox.ini contrib SHA

open-telemetry · Aug 15, 2024 · e3a4e6d · e3a4e6d
1 parent 4945578
commit e3a4e6d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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 <env to test>
-  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/