Skip to content

Commit bfd4d57

Browse files
authored
Merge pull request #1980 from IntelPython/permit-conda-build-25-1-1
[MAINT] Unpin conda-build
2 parents f56fec3 + c612f93 commit bfd4d57

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/conda-package.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
run: echo $CONDA/bin >> $GITHUB_PATH
4949
- name: Install conda-build
5050
# FIXME: unpin when conda-build fixes issues with lief
51-
run: conda install conda-build"<=24.11.2" -c conda-forge --override-channels
51+
run: conda install conda-build -c conda-forge --override-channels
5252
- name: Store conda paths as envs
5353
shell: bash -l {0}
5454
run: |
@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/upload-artifact@v4.6.0
6969
with:
7070
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
71-
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.tar.bz2
71+
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
7272
- name: Upload wheels artifact
7373
uses: actions/upload-artifact@v4.6.0
7474
with:
@@ -100,7 +100,7 @@ jobs:
100100
# FIXME: unpin when conda-build fixes issues with lief
101101
run: |
102102
conda activate
103-
conda install -y conda-build"<=24.11.2"
103+
conda install -y conda-build
104104
conda list -n base
105105
106106
- name: Cache conda packages
@@ -132,7 +132,7 @@ jobs:
132132
uses: actions/upload-artifact@v4.6.0
133133
with:
134134
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
135-
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
135+
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
136136

137137
- name: Upload wheels artifact
138138
uses: actions/upload-artifact@v4.6.0
@@ -172,7 +172,7 @@ jobs:
172172
run: |
173173
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
174174
conda index $GITHUB_WORKSPACE/channel || exit 1
175-
mv ${PACKAGE_NAME}-*.tar.bz2 $GITHUB_WORKSPACE/channel/linux-64 || exit 1
175+
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64 || exit 1
176176
conda index $GITHUB_WORKSPACE/channel || exit 1
177177
# Test channel
178178
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels --info --json > $GITHUB_WORKSPACE/ver.json
@@ -282,7 +282,7 @@ jobs:
282282
echo ${{ env.workdir }}
283283
mkdir ${{ env.workdir }}\channel
284284
mkdir ${{ env.workdir }}\channel\win-64
285-
move ${{ env.PACKAGE_NAME }}-*.tar.bz2 ${{ env.workdir }}\channel\win-64
285+
move ${{ env.PACKAGE_NAME }}-*.conda ${{ env.workdir }}\channel\win-64
286286
dir ${{ env.workdir }}\channel\win-64\
287287
288288
- name: Index the channel
@@ -427,13 +427,13 @@ jobs:
427427
- name: Add conda to system path
428428
run: echo $CONDA/bin >> $GITHUB_PATH
429429
- name: Package version
430-
run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
430+
run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.conda | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
431431

432432
- name: Upload
433433
env:
434434
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
435435
run: |
436-
anaconda --token $ANACONDA_TOKEN upload --user dppy --label dev ${PACKAGE_NAME}-*.tar.bz2
436+
anaconda --token $ANACONDA_TOKEN upload --user dppy --label dev ${PACKAGE_NAME}-*.conda
437437
438438
- name: Upload Wheels
439439
env:
@@ -472,13 +472,13 @@ jobs:
472472

473473
- name: Package version
474474
shell: bash -el {0}
475-
run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
475+
run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.conda | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
476476

477477
- name: Upload
478478
env:
479479
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
480480
run: |
481-
anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
481+
anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.conda
482482
483483
- name: Upload Wheels
484484
env:
@@ -523,7 +523,7 @@ jobs:
523523
run: |
524524
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
525525
conda index $GITHUB_WORKSPACE/channel || exit 1
526-
mv ${PACKAGE_NAME}-*.tar.bz2 $GITHUB_WORKSPACE/channel/linux-64 || exit 1
526+
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64 || exit 1
527527
conda index $GITHUB_WORKSPACE/channel || exit 1
528528
# Test channel
529529
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels --info --json > $GITHUB_WORKSPACE/ver.json
@@ -701,7 +701,7 @@ jobs:
701701
run: |
702702
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
703703
conda index $GITHUB_WORKSPACE/channel || exit 1
704-
mv ${PACKAGE_NAME}-*.tar.bz2 $GITHUB_WORKSPACE/channel/linux-64 || exit 1
704+
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64 || exit 1
705705
conda index $GITHUB_WORKSPACE/channel || exit 1
706706
# Test channel
707707
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels --info --json > $GITHUB_WORKSPACE/ver.json

0 commit comments

Comments
 (0)