fix merge wart

neil18089 · Feb 28, 2023 · 38e9982 · 38e9982
1 parent 8e1886d
commit 38e9982
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 163 deletions.
diff --git a/.github/actions/build-onedir-bare/action.yml b/.github/actions/build-onedir-bare/action.yml
diff --git a/.github/workflows/build-salt-action.yml b/.github/workflows/build-salt-action.yml
diff --git a/.github/workflows/test-action.yml b/.github/workflows/test-action.yml
@@ -103,6 +103,7 @@ jobs:
           path: nox.${{ inputs.distro-slug }}.tar.*
           key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json') }}
 
+      # Skip jobs if nox.*.tar.* is already cached
       - name: Download Onedir Tarball as an Artifact
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
         uses: actions/download-artifact@v3

diff --git a/noxfile.py b/noxfile.py
@@ -329,9 +329,6 @@ def _install_requirements(
     if not _upgrade_pip_setuptools_and_wheel(session, onedir=onedir):
         return False
 
-    if onedir and not IS_WINDOWS and not IS_DARWIN and not IS_FREEBSD:
-        session_run_always(session, "python3", "-m", "relenv", "toolchain", "fetch")
-
     # Install requirements
     requirements_file = _get_pip_requirements_file(
         session, transport, requirements_type=requirements_type