diff --git a/.github/workflows/conda/environment_macos_linux.yml b/.github/workflows/conda/environment_all.yml similarity index 100% rename from .github/workflows/conda/environment_macos_linux.yml rename to .github/workflows/conda/environment_all.yml diff --git a/.github/workflows/conda/environment_windows.yml b/.github/workflows/conda/environment_windows.yml deleted file mode 100644 index 5d8e21c5e962eedcb51514929baa082b84efb592..0000000000000000000000000000000000000000 --- a/.github/workflows/conda/environment_windows.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: eigenpy -channels: - - conda-forge -dependencies: - - eigen - - cmake - - numpy - - pkg-config - - boost - - ccache - - cxx-compiler - - ninja - - scipy diff --git a/.github/workflows/macos-linux-conda.yml b/.github/workflows/macos-linux-conda.yml index a8f9d435876d857b0ad506e85c03f5c1f6c77866..2e5358e66adbb39d5cfbf0b92f70660f07cb4817 100644 --- a/.github/workflows/macos-linux-conda.yml +++ b/.github/workflows/macos-linux-conda.yml @@ -71,7 +71,7 @@ jobs: with: activate-environment: eigenpy auto-update-conda: true - environment-file: .github/workflows/conda/environment_macos_linux.yml + environment-file: .github/workflows/conda/environment_all.yml python-version: ${{ matrix.python-version }} auto-activate-base: false diff --git a/.github/workflows/windows-conda.yml b/.github/workflows/windows-conda.yml index 286c0300fcf3dd12c52a26c88237f15760c764c2..150edd51ae160928bcbe66fbbd2e3dd44069d41a 100644 --- a/.github/workflows/windows-conda.yml +++ b/.github/workflows/windows-conda.yml @@ -53,7 +53,7 @@ jobs: with: activate-environment: eigenpy auto-update-conda: true - environment-file: .github/workflows/conda/environment_windows.yml + environment-file: .github/workflows/conda/environment_all.yml python-version: "3.10" auto-activate-base: false