Skip to content

Commit 52b80f0

Browse files
authored
Merge 02f27a8 into bd0b5b0
2 parents bd0b5b0 + 02f27a8 commit 52b80f0

File tree

1 file changed

+8
-28
lines changed

1 file changed

+8
-28
lines changed

.github/workflows/conda-package.yml

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ env:
1616
CONDA_BUILD_INDEX_ENV_PY_VER: '3.12' # conda does not support python 3.13
1717
CONDA_BUILD_VERSION: '25.1.1'
1818
CONDA_INDEX_VERSION: '0.5.0'
19-
CONDA_CPH_VERSION: '2.4.0'
2019
RERUN_TESTS_ON_FAILURE: 'true'
2120
RUN_TESTS_MAX_ATTEMPTS: 2
2221
TEST_ENV_NAME: 'test'
@@ -130,7 +129,6 @@ jobs:
130129
env:
131130
channel-path: '${{ github.workspace }}/channel/'
132131
pkg-path-in-channel: '${{ github.workspace }}/channel/linux-64/'
133-
extracted-pkg-path: '${{ github.workspace }}/pkg/'
134132
ver-json-path: '${{ github.workspace }}/version.json'
135133

136134
steps:
@@ -163,14 +161,9 @@ jobs:
163161
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
164162
activate-environment: ${{ env.TEST_ENV_NAME }}
165163

166-
- name: Install conda-index and conda-package-handling
164+
- name: Install conda-index
167165
run: |
168-
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }} conda-package-handling=${{ env.CONDA_CPH_VERSION }}
169-
170-
- name: Extract package archive
171-
run: |
172-
mkdir -p ${{ env.extracted-pkg-path }}
173-
cph extract ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.conda --dest ${{ env.extracted-pkg-path }}
166+
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
174167
175168
- name: Create conda channel
176169
run: |
@@ -255,7 +248,6 @@ jobs:
255248
env:
256249
channel-path: '${{ github.workspace }}\channel\'
257250
pkg-path-in-channel: '${{ github.workspace }}\channel\win-64\'
258-
extracted-pkg-path: '${{ github.workspace }}\pkg'
259251
ver-json-path: '${{ github.workspace }}\version.json'
260252
workdir: '${{ github.workspace }}'
261253

@@ -269,7 +261,6 @@ jobs:
269261
- name: Store a path to package archive
270262
run: |
271263
@echo on
272-
mkdir -p ${{ env.extracted-pkg-path }}
273264
274265
set SEARCH_SCRIPT="DIR ${{ env.pkg-path-in-channel }} /s/b | FINDSTR /r "dpnp-.*\.conda""
275266
FOR /F "tokens=* USEBACKQ" %%F IN (`%SEARCH_SCRIPT%`) DO (
@@ -294,14 +285,9 @@ jobs:
294285
(echo CONDA_LIB_PATH=%CONDA_PREFIX%\Library\lib\) >> %GITHUB_ENV%
295286
(echo CONDA_LIB_BIN_PATH=%CONDA_PREFIX%\Library\bin\) >> %GITHUB_ENV%
296287
297-
- name: Install conda-index and conda-package-handling
298-
run: |
299-
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }} conda-package-handling=${{ env.CONDA_CPH_VERSION }}
300-
301-
- name: Extract package archive
288+
- name: Install conda-index
302289
run: |
303-
cph extract %FULL_PACKAGE_PATH% --dest ${{ env.extracted-pkg-path }}
304-
dir ${{ env.extracted-pkg-path }}
290+
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
305291
306292
- name: Create conda channel
307293
run: |
@@ -467,7 +453,6 @@ jobs:
467453
array-api-skips-file: '${{ github.workspace }}/dpnp/.github/workflows/array-api-skips.txt'
468454
channel-path: '${{ github.workspace }}/channel/'
469455
pkg-path-in-channel: '${{ github.workspace }}/channel/linux-64/'
470-
extracted-pkg-path: '${{ github.workspace }}/pkg/'
471456
ver-json-path: '${{ github.workspace }}/version.json'
472457

473458
steps:
@@ -500,21 +485,16 @@ jobs:
500485
python-version: ${{ matrix.python }}
501486
activate-environment: 'array-api-conformity'
502487

503-
- name: Install conda-index and conda-package-handling
488+
- name: Install conda-index
504489
id: install_conda_index
505490
continue-on-error: true
506491
run: |
507-
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }} conda-package-handling=${{ env.CONDA_CPH_VERSION }}
492+
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
508493
509-
- name: ReInstall conda-index and conda-package-handling
494+
- name: ReInstall conda-index
510495
if: steps.install_conda_index.outcome == 'failure'
511496
run: |
512-
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }} conda-package-handling=${{ env.CONDA_CPH_VERSION }}
513-
514-
- name: Extract package archive
515-
run: |
516-
mkdir -p ${{ env.extracted-pkg-path }}
517-
cph extract ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.conda --dest ${{ env.extracted-pkg-path }}
497+
mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
518498
519499
- name: Create conda channel
520500
run: |

0 commit comments

Comments
 (0)