Skip to content

Commit e1325c5

Browse files
authored
update workflow (#130)
1 parent 956af39 commit e1325c5

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

.github/workflows/conda-package-cf.yml

+9-13
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ jobs:
3939
run: echo $CONDA/bin >> $GITHUB_PATH
4040
- name: Install conda-build
4141
run: conda install conda-build
42-
- name: Build conda package with NumPy 2
42+
- name: Build conda package with NumPy 2.0
4343
run: |
4444
CHANNELS="-c conda-forge --override-channels"
45-
VERSIONS="--python ${{ matrix.python }} --numpy 2"
45+
VERSIONS="--python ${{ matrix.python }} --numpy 2.0"
4646
TEST="--no-test"
4747
4848
conda build \
@@ -54,7 +54,7 @@ jobs:
5454
uses: actions/upload-artifact@v4
5555
with:
5656
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
57-
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.tar.bz2
57+
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
5858

5959
test:
6060
needs: build
@@ -82,7 +82,7 @@ jobs:
8282
- name: Create conda channel
8383
run: |
8484
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
85-
mv ${PACKAGE_NAME}-*.tar.bz2 $GITHUB_WORKSPACE/channel/linux-64
85+
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64
8686
conda index $GITHUB_WORKSPACE/channel
8787
# Test channel
8888
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels
@@ -137,9 +137,7 @@ jobs:
137137
activate-environment: build
138138
python-version: ${{ matrix.python }}
139139
channels: conda-forge,nodefaults
140-
141-
- name: Remove defaults channel
142-
run: conda config --remove channels defaults
140+
conda-remove-defaults: 'true'
143141

144142
- name: Install conda-build
145143
run: conda install -n base conda-build
@@ -159,7 +157,7 @@ jobs:
159157
- name: Build conda package with NumPy 2.0
160158
run: |
161159
conda activate
162-
conda build --no-test --python ${{ matrix.python }} --numpy 2 -c conda-forge --override-channels conda-recipe-cf
160+
conda build --no-test --python ${{ matrix.python }} --numpy 2.0 -c conda-forge --override-channels conda-recipe-cf
163161
164162
- name: Store conda paths as envs
165163
shell: bash -l {0}
@@ -170,7 +168,7 @@ jobs:
170168
uses: actions/upload-artifact@v4
171169
with:
172170
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
173-
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
171+
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
174172

175173
test_windows:
176174
needs: build_windows
@@ -201,17 +199,15 @@ jobs:
201199
activate-environment: ${{ env.TEST_ENV_NAME }}
202200
python-version: ${{ matrix.python }}
203201
channels: conda-forge
204-
205-
- name: Remove defaults channel
206-
run: conda config --remove channels defaults
202+
conda-remove-defaults: 'true'
207203

208204
- name: Create conda channel with the artifact bit
209205
shell: cmd /C CALL {0}
210206
run: |
211207
echo ${{ env.workdir }}
212208
mkdir ${{ env.workdir }}\channel\
213209
mkdir ${{ env.workdir }}\channel\win-64
214-
move ${{ env.PACKAGE_NAME }}-*.tar.bz2 ${{ env.workdir }}\channel\win-64
210+
move ${{ env.PACKAGE_NAME }}-*.conda ${{ env.workdir }}\channel\win-64
215211
dir ${{ env.workdir }}\channel\win-64
216212
217213
- name: Install conda index

.github/workflows/conda-package.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
uses: actions/upload-artifact@v4
5555
with:
5656
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
57-
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.tar.bz2
57+
path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.conda
5858

5959
test:
6060
needs: build
@@ -81,7 +81,7 @@ jobs:
8181
- name: Create conda channel
8282
run: |
8383
mkdir -p $GITHUB_WORKSPACE/channel/linux-64
84-
mv ${PACKAGE_NAME}-*.tar.bz2 $GITHUB_WORKSPACE/channel/linux-64
84+
mv ${PACKAGE_NAME}-*.conda $GITHUB_WORKSPACE/channel/linux-64
8585
conda index $GITHUB_WORKSPACE/channel
8686
# Test channel
8787
conda search $PACKAGE_NAME -c $GITHUB_WORKSPACE/channel --override-channels
@@ -135,9 +135,7 @@ jobs:
135135
activate-environment: build
136136
python-version: ${{ matrix.python }}
137137
channels: conda-forge
138-
139-
- name: Remove defaults channel
140-
run: conda config --remove channels defaults
138+
conda-remove-defaults: 'true'
141139

142140
- name: Install conda-build
143141
run: |
@@ -170,7 +168,7 @@ jobs:
170168
uses: actions/upload-artifact@v4
171169
with:
172170
name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
173-
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.tar.bz2
171+
path: ${{ env.CONDA_BLD }}${{ env.PACKAGE_NAME }}-*.conda
174172

175173
test_windows:
176174
needs: build_windows
@@ -199,17 +197,15 @@ jobs:
199197
activate-environment: ${{ env.TEST_ENV_NAME }}
200198
python-version: ${{ matrix.python }}
201199
channels: conda-forge
202-
203-
- name: Remove defaults channel
204-
run: conda config --remove channels defaults
200+
conda-remove-defaults: 'true'
205201

206202
- name: Create conda channel with the artifact bit
207203
shell: cmd /C CALL {0}
208204
run: |
209205
echo ${{ env.workdir }}
210206
mkdir ${{ env.workdir }}\channel\
211207
mkdir ${{ env.workdir }}\channel\win-64
212-
move ${{ env.PACKAGE_NAME }}-*.tar.bz2 ${{ env.workdir }}\channel\win-64
208+
move ${{ env.PACKAGE_NAME }}-*.conda ${{ env.workdir }}\channel\win-64
213209
dir ${{ env.workdir }}\channel\win-64
214210
215211
- name: Install conda index

0 commit comments

Comments
 (0)