From ec0aa399885aab933adff2428a1fa8413ac1fb90 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Fri, 1 Nov 2024 19:04:39 +1100 Subject: [PATCH 1/2] update ci --- .github/workflows/gh-ci.yaml | 2 +- .../.github/workflows/{{cookiecutter._ci_name}}.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index 4163f26..ffb8e11 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.github/workflows/gh-ci.yaml @@ -158,7 +158,7 @@ jobs: environment-file: docs/requirements.yaml add-pip-as-python-dependency: true architecture: x64 - miniforge-variant: Mambaforge + miniforge-version: "latest" use-mamba: true channels: conda-forge, defaults activate-environment: cookiecutter-mdakit-docs diff --git a/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml b/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml index 73d8d92..dd7f537 100644 --- a/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml +++ b/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml @@ -66,10 +66,11 @@ jobs: environment-file: devtools/conda-envs/test_env.yaml add-pip-as-python-dependency: true {% if cookiecutter.__dependency_source == 'conda-forge' %} - miniforge-variant: Mambaforge + miniforge-version: "latest" use-mamba: true channels: conda-forge, defaults {% elif cookiecutter.__dependency_source == 'anaconda' %} + miniconda-version: "latest" channels: defaults {% endif %} activate-environment: {{cookiecutter.repo_name}}-test From a6807d3c42b9fa197c25d1a3a4f36599657701da Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Sat, 16 Nov 2024 14:21:07 +1100 Subject: [PATCH 2/2] remove defaults from channels --- .github/workflows/gh-ci.yaml | 2 +- .../.github/workflows/{{cookiecutter._ci_name}}.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index ffb8e11..79e462d 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.github/workflows/gh-ci.yaml @@ -160,7 +160,7 @@ jobs: architecture: x64 miniforge-version: "latest" use-mamba: true - channels: conda-forge, defaults + channels: conda-forge activate-environment: cookiecutter-mdakit-docs auto-update-conda: true show-channel-urls: true diff --git a/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml b/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml index ee5acbe..c732742 100644 --- a/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml +++ b/{{cookiecutter.repo_name}}/.github/workflows/{{cookiecutter._ci_name}}.yaml @@ -68,7 +68,7 @@ jobs: {% if cookiecutter.__dependency_source == 'conda-forge' %} miniforge-version: "latest" use-mamba: true - channels: conda-forge, defaults + channels: conda-forge {% elif cookiecutter.__dependency_source == 'anaconda' %} miniconda-version: "latest" channels: defaults