Merge branch 'main' into issue_3887

open-telemetry · Jul 3, 2024 · 27251a4 · 27251a4
2 parents e8773c1 + 3836da8
commit 27251a4
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -95,8 +95,7 @@ jobs:
       if: ${{ matrix.os == 'windows-2019'}}
       run: git config --system core.longpaths true
     - name: run tox
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{
-        env.RUN_MATRIX_COMBINATION }}-benchmark.json
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip
   misc:
     strategy:
       fail-fast: false
@@ -216,4 +215,4 @@ jobs:
         key: v3-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os
           }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
     - name: run tox
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-skip