Ignore benchmakrs

open-telemetry · Jul 17, 2024 · 22912ef · 22912ef
1 parent ed2473e
commit 22912ef
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 35 deletions.
diff --git a/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py b/.github/workflows/generate_workflows_lib/src/generate_workflows_lib/__init__.py
@@ -173,11 +173,14 @@ def get_misc_job_datas(tox_envs: list) -> list:
 
     misc_job_datas = []
 
+    _tox_benchmark_env_regex = re_compile(r"benchmark.+")
+
     for tox_env in tox_envs:
         if (
             _tox_test_env_regex.match(tox_env) is not None or
             _tox_lint_env_regex.match(tox_env) is not None or
-            _tox_contrib_env_regex.match(tox_env) is not None
+            _tox_contrib_env_regex.match(tox_env) is not None or
+            _tox_benchmark_env_regex.match(tox_env) is not None
         ):
             continue
 

diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -15,8 +15,8 @@ env:
 
 jobs:
 
-  benchmark-sdk-extension-aws:
-    name: benchmark-sdk-extension-aws
+  spellcheck:
+    name: spellcheck
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -31,10 +31,10 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e benchmark-sdk-extension-aws -- -ra
+        run: tox -e spellcheck -- -ra
 
-  benchmark-propagator-aws-xray:
-    name: benchmark-propagator-aws-xray
+  docker-tests:
+    name: docker-tests
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -49,10 +49,10 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e benchmark-propagator-aws-xray -- -ra
+        run: tox -e docker-tests -- -ra
 
-  spellcheck:
-    name: spellcheck
+  docs:
+    name: docs
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -67,10 +67,10 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e spellcheck -- -ra
+        run: tox -e docs -- -ra
 
-  docker-tests:
-    name: docker-tests
+  generate:
+    name: generate
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -85,28 +85,13 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e docker-tests -- -ra
-
-  docs:
-    name: docs
-    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
+        run: tox -e generate -- -ra
 
-      - name: Run tests
-        run: tox -e docs -- -ra
+      - 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)
 
-  generate:
-    name: generate
+  generate_workflows:
+    name: generate_workflows
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
@@ -121,7 +106,7 @@ jobs:
         run: pip install tox
 
       - name: Run tests
-        run: tox -e generate -- -ra
+        run: tox -e generate_workflows -- -ra
 
       - 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)
+        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)
diff --git a/tox.ini b/tox.ini
@@ -363,8 +363,8 @@ envlist =
     spellcheck
     docker-tests
     docs
-
     generate
+    generate_workflows
 
 [testenv]
 deps =