8000 Merge pull request #1128 from roryyorke/gh-action-conda-warning · python-control/python-control@061749d · GitHub
[go: up one dir, main page]
Skip to content

Commit 061749d

Browse files
murrayrmmurrayrm
authored
Merge pull request #1128 from roryyorke/gh-action-conda-warning
Silence warning from Conda in Github Actions
2 parents 2a919cc + 814f414 commit 061749d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

‎.github/workflows/doctest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
activate-environment: doctest-env
2020
environment-file: .github/conda-env/doctest-env.yml
2121
miniforge-version: latest
22-
channels: conda-forge
22+
channels: conda-forge,defaults
2323
channel-priority: strict
2424
auto-update-conda: false
2525
auto-activate-base: false

‎.github/workflows/python-package-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
activate-environment: test-env
3939
environment-file: .github/conda-env/test-env.yml
4040
miniforge-version: latest
41-
channels: conda-forge
41+
channels: conda-forge,defaults
4242
channel-priority: strict
4343
auto-update-conda: false
4444
auto-activate-base: false

0 commit comments

Comments
 (0)
0