From 513210d623ae362241c874ee2be2e9b9934d48b1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 6 Dec 2023 10:35:43 +0900 Subject: [PATCH] Use a different ci environment on Windows --- .github/workflows/conda-forge-tests.yml | 11 +++++++++-- ci_env.yml | 2 ++ ci_env_win.yml | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ci_env_win.yml diff --git a/.github/workflows/conda-forge-tests.yml b/.github/workflows/conda-forge-tests.yml index 3dff8597..3dab15bc 100644 --- a/.github/workflows/conda-forge-tests.yml +++ b/.github/workflows/conda-forge-tests.yml @@ -25,11 +25,20 @@ jobs: shell: bash -l {0} id: week run: echo "week=$(date +%Y-%U)" >> "${GITHUB_OUTPUT}" + - uses: mamba-org/setup-micromamba@v1 + if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') with: environment-file: ci_env.yml cache-environment-key: environment-${{ steps.week.outputs.week }}-${{ matrix.os }} + + - uses: mamba-org/setup-micromamba@v1 + if: contains(matrix.os, 'windows') + with: + environment-file: ci_env_win.yml + cache-environment-key: environment-${{ steps.week.outputs.week }}-${{ matrix.os }} + - name: Print packages and environment shell: bash -l {0} run: | @@ -46,8 +55,6 @@ jobs: shell: bash -l {0} if: contains(matrix.os, 'macos') || contains(matrix.os, 'ubuntu') run: | - # Add additional dependencies not available on Windows - micromamba install jax pytorch pytest - name: Test with pytest [Windows] diff --git a/ci_env.yml b/ci_env.yml index 114c442f..1e30ad63 100644 --- a/ci_env.yml +++ b/ci_env.yml @@ -16,3 +16,5 @@ dependencies: - pytest-repeat - icub-models - idyntree + - jax + - pytorch diff --git a/ci_env_win.yml b/ci_env_win.yml new file mode 100644 index 00000000..114c442f --- /dev/null +++ b/ci_env_win.yml @@ -0,0 +1,18 @@ +name: adamdev +channels: + - conda-forge +dependencies: + - python >=3.7 + - numpy + - scipy + - casadi + - prettytable + - urdfdom-py + - pip + - wheel + - setuptools + - setuptools_scm + - pytest + - pytest-repeat + - icub-models + - idyntree