From 4d15d4cdc1c23dc10dab574c3905d97eac2ec7e9 Mon Sep 17 00:00:00 2001
From: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>
Date: Mon, 18 Nov 2024 10:54:11 -0600
Subject: [PATCH 1/2] Remove use of nodefaults channel, use
 conda-remove-defaults: true instead

This change is prompted by CI warning:

```
'nodefaults' channel detected: will remove 'defaults' if added implicitly.
In the future, 'nodefaults' as a way of removing 'defaults' won't be
supported. Please set 'conda-remove-defaults' = 'true' to remove this warning.
```
---
 .github/workflows/conda-package.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index dc85422a22..1c7ace5e59 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -91,7 +91,8 @@ jobs:
           miniforge-variant: Miniforge3
           miniforge-version: latest
           activate-environment: build
-          channels: conda-forge,nodefaults
+          channels: conda-forge
+          conda-remove-defaults: true
           python-version: ${{ matrix.python }}
 
       - name: Install conda build
@@ -263,7 +264,8 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v3
         with:
           miniforge-version: latest
-          channels: conda-forge,nodefaults
+          channels: conda-forge
+          conda-remove-defaults: true
           activate-environment: ${{ env.TEST_ENV_NAME }}
           python-version: ${{ matrix.python }}
 
@@ -800,7 +802,8 @@ jobs:
         with:
           run-post: false
           channel-priority: "disabled"
-          channels: conda-forge,nodefaults
+          channels: conda-forge
+          conda-remove-defaults: true
           python-version: '3.11'
 
       - name: Install anaconda-client

From 60da3e739e7797de45a44c6653006701b5b9ebcb Mon Sep 17 00:00:00 2001
From: Oleksandr Pavlyk <oleksandr.pavlyk@intel.com>
Date: Tue, 19 Nov 2024 08:17:07 -0600
Subject: [PATCH 2/2] Set channels and conda-remove-defaults in upload_windows
 step as well

---
 .github/workflows/conda-package.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index 1c7ace5e59..87fceb1830 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -459,6 +459,9 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v3
         with:
+          miniforge-version: latest
+          channels: conda-forge
+          conda-remove-defaults: true
           auto-activate-base: true
           activate-environment: ""