From 48319d7eef06e0d2341ab30b83235afcabdf4e22 Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Mon, 9 Mar 2026 02:16:39 -0700 Subject: [PATCH 1/4] revert setup miniconda to creating a build env in conda package on Windows --- .github/workflows/conda-package.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 478a16295e..165ac58340 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -100,15 +100,15 @@ jobs: with: miniforge-variant: Miniforge3 miniforge-version: latest - auto-activate: true - activate-environment: base + activate-environment: build channels: conda-forge conda-remove-defaults: true python-version: ${{ matrix.python }} - name: Install conda build run: | - conda install -n base -y conda-build + conda activate + conda install -y conda-build conda list -n base - name: Cache conda packages @@ -133,6 +133,7 @@ jobs: env: OVERRIDE_INTEL_IPO: 1 # IPO requires more resources that GH actions VM provides run: | + conda activate # TODO: roll back use of Intel channel when 2025.1 is available on conda-forge conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels conda-recipe From 5fa5f40f2aba49a04fa941eccd3ce115520db307 Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Mon, 9 Mar 2026 02:44:22 -0700 Subject: [PATCH 2/4] setup shell in build_windows step drops conda activate commands --- .github/workflows/conda-package.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 165ac58340..acba72a257 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -82,6 +82,9 @@ jobs: build_windows: runs-on: windows-latest timeout-minutes: 150 + defaults: + run: + shell: cmd /C CALL {0} strategy: matrix: @@ -107,7 +110,6 @@ jobs: - name: Install conda build run: | - conda activate conda install -y conda-build conda list -n base @@ -133,7 +135,6 @@ jobs: env: OVERRIDE_INTEL_IPO: 1 # IPO requires more resources that GH actions VM provides run: | - conda activate # TODO: roll back use of Intel channel when 2025.1 is available on conda-forge conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c ${{ env.INTEL_CHANNEL }} -c conda-forge --override-channels conda-recipe From 416c44e3e663badfd590f073bb9b6656f7d6904e Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Mon, 9 Mar 2026 03:22:29 -0700 Subject: [PATCH 3/4] specify environment in upload_windows step in conda package workflow --- .github/workflows/conda-package.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index acba72a257..95b4b9b0be 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -101,7 +101,6 @@ jobs: - uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0 with: - miniforge-variant: Miniforge3 miniforge-version: latest activate-environment: build channels: conda-forge @@ -466,6 +465,9 @@ jobs: (github.ref == 'refs/heads/master' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/')) runs-on: windows-latest timeout-minutes: 20 + defaults: + run: + shell: cmd /C CALL {0} strategy: matrix: python: ['3.10', '3.11', '3.12', '3.13', '3.14'] @@ -486,7 +488,7 @@ jobs: channels: conda-forge conda-remove-defaults: true auto-activate: true - activate-environment: base + activate-environment: upload - name: Install anaconda-client run: conda install anaconda-client -c conda-forge --override-channels From 5c06579fc557b0c6bc276cde394da95c2834fbe5 Mon Sep 17 00:00:00 2001 From: Nikita Grigorian Date: Mon, 9 Mar 2026 03:27:12 -0700 Subject: [PATCH 4/4] drop auto-activate in upload_windows step --- .github/workflows/conda-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 95b4b9b0be..babf90749b 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -487,7 +487,6 @@ jobs: miniforge-version: latest channels: conda-forge conda-remove-defaults: true - auto-activate: true activate-environment: upload - name: Install anaconda-client