use separate git cache for this one

conda · Nov 24, 2024 · b7f59ef · b7f59ef
1 parent 16260bf
commit b7f59ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -147,7 +147,7 @@ jobs:
         run: >
           pytest
           --cov=conda_build
-          -n auto
+          -n ${{ env.PYTEST_MARKER == 'serial' && 1 || 'auto' }}
           -m "${{ env.PYTEST_MARKER }}"
 
       - name: Upload Coverage
@@ -315,7 +315,7 @@ jobs:
           pytest
           --cov=conda_build
           --basetemp=${{ runner.temp }}
-          -n auto
+          -n ${{ env.PYTEST_MARKER == 'serial' && 1 || 'auto' }}
           -m "${{ env.PYTEST_MARKER }}"
 
       - name: Upload Coverage
@@ -431,7 +431,7 @@ jobs:
         run: >
           pytest
           --cov=conda_build
-          -n auto
+          -n ${{ env.PYTEST_MARKER == 'serial' && 1 || 'auto' }}
           -m "${{ env.PYTEST_MARKER }}"
         env:
           CONDA_BUILD_SYSROOT: ${{ env.MACOSX_SDK_ROOT }}

diff --git a/tests/test_api_build.py b/tests/test_api_build.py
@@ -129,13 +129,17 @@ def test_recipe_builds(
     testing_config,
     monkeypatch: pytest.MonkeyPatch,
     conda_build_test_recipe_envvar: str,
+    tmp_path_factory: pytest.TempPathFactory,
 ):
     # TODO: After we fix #3754 this mark can be removed. This specific test
     #   ``source_setup_py_data_subdir`` reproduces the problem.
     if recipe.name == "source_setup_py_data_subdir":
         pytest.xfail("Issue related to #3754 on conda-build.")
     elif recipe.name == "unicode_all_over" and context.solver == "libmamba":
         pytest.xfail("Unicode package names not supported in libmamba.")
+    elif recipe.name == "source_url":
+        # Several recipes are cloning conda-build, which causes problems with checkouts
+        testing_config.git_cache = tmp_path_factory.mktemp("git_cache", numbered=False)
 
     # These variables are defined solely for testing purposes,
     # so they can be checked within build scripts