From 57cacca4b4b0cff34226fab95c09f534bb4e63be Mon Sep 17 00:00:00 2001
From: Nikita Grigorian <nikita.grigorian@intel.com>
Date: Mon, 4 May 2026 11:59:26 -0700
Subject: [PATCH 1/2] update base env Conda in workflow

also separates conda build installation into a separate step, and adds new debug steps
---
 .github/workflows/conda-package.yml | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index 5ab4d9a835..7962437b78 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -51,8 +51,15 @@ jobs:
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
       - name: Add conda to system path
         run: echo $CONDA/bin >> $GITHUB_PATH
+      - name: Update conda
+        run: |
+          conda update -n base --all
       - name: Install conda-build
-        run: conda install conda-build -c conda-forge --override-channels
+        run: |
+          conda install conda-build -c conda-forge --override-channels
+      - name: Show Conda info
+        run: |
+          conda info --all
       - name: Store conda paths as envs
         shell: bash -l {0}
         run: |
@@ -105,12 +112,12 @@ jobs:
           activate-environment: build
           channels: conda-forge
           python-version: ${{ matrix.python }}
-
-      - name: Install conda build
+      - name: Update conda
+        run: |
+          conda update -n base --all
+      - name: Install conda-build
         run: |
           conda install -n base -y conda-build
-          conda list -n base
-
       - name: Cache conda packages
         uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
         env:
@@ -122,13 +129,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-python-${{ matrix.python }}-
             ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-
-
       - name: Store conda paths as envs
         shell: bash -l {0}
         run: |
           echo "CONDA_BLD=$CONDA/conda-bld/win-64/" | tr "\\\\" '/' >> $GITHUB_ENV
           echo "WHEELS_OUTPUT_FOLDER=$GITHUB_WORKSPACE${{ runner.os == 'Linux' && '/' || '\\' }}" >> $GITHUB_ENV
-
+      - name: Show Conda info
+        run: |
+          conda info --all
+      - name: List base environment packages
+        run: |
+          conda list -n base
       - name: Build conda package
         env:
           OVERRIDE_INTEL_IPO: 1   # IPO requires more resources that GH actions VM provides

From e9ee22c6dac7c1fc1aab6c3dd3fbd16801e057c9 Mon Sep 17 00:00:00 2001
From: Nikita Grigorian <nikita.grigorian@intel.com>
Date: Mon, 4 May 2026 14:20:32 -0700
Subject: [PATCH 2/2] modify conda-index installation

align with conda-build
---
 .github/workflows/conda-package.yml | 30 +++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
index 7962437b78..f3a15e0075 100644
--- a/.github/workflows/conda-package.yml
+++ b/.github/workflows/conda-package.yml
@@ -56,10 +56,13 @@ jobs:
           conda update -n base --all
       - name: Install conda-build
         run: |
-          conda install conda-build -c conda-forge --override-channels
+          conda install -n base conda-build -c conda-forge --override-channels
       - name: Show Conda info
         run: |
           conda info --all
+      - name: List base environment packages
+        run: |
+          conda list -n base
       - name: Store conda paths as envs
         shell: bash -l {0}
         run: |
@@ -183,11 +186,18 @@ jobs:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
       - name: Add conda to system path
         run: echo $CONDA/bin >> $GITHUB_PATH
-      - name: Install conda-index
-        # Needed to be able to run conda index
+      - name: Update conda
         run: |
           conda update -n base --all
-          conda install conda-index -c conda-forge --override-channels
+      - name: Install conda-index
+        run: |
+          conda install -n base conda-index -c conda-forge --override-channels
+      - name: Show Conda info
+        run: |
+          conda info --all
+      - name: List base environment packages
+        run: |
+          conda list -n base
       - name: Create conda channel
         run: |
           mkdir -p $GITHUB_WORKSPACE/channel/linux-64
@@ -290,10 +300,22 @@ jobs:
           activate-environment: ${{ env.TEST_ENV_NAME }}
           python-version: ${{ matrix.python }}
 
+      - name: Update conda
+        run: |
+          conda update -n base --all
+
       - name: Install conda-index
         run: |
           conda install -n base conda-index
 
+      - name: Show Conda info
+        run: |
+          conda info --all
+
+      - name: List base environment packages
+        run: |
+          conda list -n base
+
       - name: Create conda channel with the artifact bit
         shell: cmd /C CALL {0}
         run: |