From d5b6ccf797d09fa6dd139e2927709ab65bc49129 Mon Sep 17 00:00:00 2001
From: Joris Vaillant <joris.vaillant@inria.fr>
Date: Tue, 9 Apr 2024 20:45:52 +0200
Subject: [PATCH] ci: Use same conda environment for Mac/Linux/Windows
---
...ironment_macos_linux.yml => environment_all.yml} | 0
.github/workflows/conda/environment_windows.yml | 13 -------------
.github/workflows/macos-linux-conda.yml | 2 +-
.github/workflows/windows-conda.yml | 2 +-
4 files changed, 2 insertions(+), 15 deletions(-)
rename .github/workflows/conda/{environment_macos_linux.yml => environment_all.yml} (100%)
delete mode 100644 .github/workflows/conda/environment_windows.yml
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 5d8e21c5..00000000
--- 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 a8f9d435..2e5358e6 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 286c0300..150edd51 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
--
GitLab