Skip to content

Commit c02d212

Browse files
committed
.conda is the new default package format
1 parent 6f88839 commit c02d212

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

.github/workflows/conda-package.yml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
102102
with:
103103
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
104-
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
104+
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
105105

106106
- name: Upload wheels artifact
107107
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
@@ -139,11 +139,6 @@ jobs:
139139
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
140140
path: ${{ env.pkg-path-in-channel }}
141141

142-
- name: Extract package archive
143-
run: |
144-
mkdir -p ${{ env.extracted-pkg-path }}
145-
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
146-
147142
- name: Setup miniconda
148143
id: setup_miniconda
149144
continue-on-error: true
@@ -167,6 +162,11 @@ jobs:
167162
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
168163
activate-environment: ${{ env.TEST_ENV_NAME }}
169164

165+
- name: Extract package archive
166+
run: |
167+
mkdir -p ${{ env.extracted-pkg-path }}
168+
cph extract ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.conda --dest ${{ env.extracted-pkg-path }}
169+
170170
- name: Install conda-index
171171
run: mamba install conda-index=${{ env.CONDA_INDEX_VERSION }}
172172

@@ -264,19 +264,17 @@ jobs:
264264
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
265265
path: ${{ env.pkg-path-in-channel }}
266266

267-
- name: Extract package archive
267+
- name: Store a path to package archive
268268
run: |
269269
@echo on
270270
mkdir -p ${{ env.extracted-pkg-path }}
271271
272-
set SEARCH_SCRIPT="DIR ${{ env.pkg-path-in-channel }} /s/b | FINDSTR /r "dpnp-.*\.tar\.bz2""
272+
set SEARCH_SCRIPT="DIR ${{ env.pkg-path-in-channel }} /s/b | FINDSTR /r "dpnp-.*\.conda""
273273
FOR /F "tokens=* USEBACKQ" %%F IN (`%SEARCH_SCRIPT%`) DO (
274274
SET FULL_PACKAGE_PATH=%%F
275275
)
276276
echo FULL_PACKAGE_PATH: %FULL_PACKAGE_PATH%
277-
278-
python -c "import shutil; shutil.unpack_archive(r\"%FULL_PACKAGE_PATH%\", extract_dir=r\"${{ env.extracted-pkg-path }}\")"
279-
dir ${{ env.extracted-pkg-path }}
277+
(echo FULL_PACKAGE_PATH=%FULL_PACKAGE_PATH%) >> %GITHUB_ENV%
280278
281279
- name: Setup miniconda
282280
uses: conda-incubator/setup-miniconda@505e6394dae86d6a5c7fbb6e3fb8938e3e863830 # v3.1.1
@@ -288,6 +286,11 @@ jobs:
288286
python-version: ${{ env.CONDA_BUILD_INDEX_ENV_PY_VER}}
289287
activate-environment: ${{ env.TEST_ENV_NAME }}
290288

289+
- name: Extract package archive
290+
run: |
291+
cph extract %FULL_PACKAGE_PATH% --dest ${{ env.extracted-pkg-path }}
292+
dir ${{ env.extracted-pkg-path }}
293+
291294
- name: Store conda paths as envs
292295
run: |
293296
@echo on
@@ -418,11 +421,11 @@ jobs:
418421
- name: Package version
419422
shell: bash -el {0}
420423
run: |
421-
echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
424+
echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.conda | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
422425
423426
- name: Upload
424427
run: |
425-
anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
428+
anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.conda
426429
env:
427430
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
428431

@@ -471,11 +474,6 @@ jobs:
471474
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
472475
path: ${{ env.pkg-path-in-channel }}
473476

474-
- name: Extract package archive
475-
run: |
476-
mkdir -p ${{ env.extracted-pkg-path }}
477-
tar -xvf ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.tar.bz2 -C ${{ env.extracted-pkg-path }}
478-
479477
- name: Setup miniconda
480478
id: setup_miniconda
481479
continue-on-error: true
@@ -499,6 +497,11 @@ jobs:
499497
python-version: ${{ matrix.python }}
500498
activate-environment: 'array-api-conformity'
501499

500+
- name: Extract package archive
501+
run: |
502+
mkdir -p ${{ env.extracted-pkg-path }}
503+
cph extract ${{ env.pkg-path-in-channel }}/${{ env.PACKAGE_NAME }}-*.conda --dest ${{ env.extracted-pkg-path }}
504+
502505
- name: Install conda-index
503506
id: install_conda_index
504507
continue-on-error: true

0 commit comments

Comments
 (0)