Skip to content

Commit e128f86

Browse files
ndgrigorianndgrigorian
committed
clean up windows build workflows
1 parent f642e7b commit e128f86

2 files changed

Lines changed: 37 additions & 42 deletions

File tree

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

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ permissions: read-all
1010

1111
env:
1212
PACKAGE_NAME: mkl_umath
13+
MODULE_NAME: mkl_umath
14+
TEST_ENV_NAME: test_mkl_umath
1315
VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['mkl_umath'][0];"
1416
VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
1517

@@ -114,7 +116,7 @@ jobs:
114116
- name: Collect dependencies
115117
run: |
116118
CHANNELS=(-c "$GITHUB_WORKSPACE/channel" -c "conda-forge" --override-channels)
117-
conda create -n test_mkl_umath "$PACKAGE_NAME" "python=${{ matrix.python }}" "${CHANNELS[@]}" --only-deps --dry-run > lockfile
119+
conda create -n "${{ env.TEST_ENV_NAME }}" "$PACKAGE_NAME" "python=${{ matrix.python }}" "${CHANNELS[@]}" --only-deps --dry-run > lockfile
118120
- name: Display lockfile
119121
run: cat lockfile
120122

@@ -137,25 +139,27 @@ jobs:
137139
- name: Install mkl_umath
138140
run: |
139141
CHANNELS=(-c "$GITHUB_WORKSPACE/channel" -c "conda-forge" --override-channels)
140-
conda create -n test_mkl_umath "python=${{ matrix.python }}" "$PACKAGE_NAME" pytest "${CHANNELS[@]}"
142+
conda create -n "${{ env.TEST_ENV_NAME }}" "python=${{ matrix.python }}" "$PACKAGE_NAME" pytest "${CHANNELS[@]}"
141143
# Test installed packages
142-
conda list -n test_mkl_umath
144+
conda list -n "${{ env.TEST_ENV_NAME }}"
143145
144146
- name: Smoke test
145147
run: |
146148
source "$CONDA/etc/profile.d/conda.sh"
147-
conda activate test_mkl_umath
149+
conda activate "${{ env.TEST_ENV_NAME }}"
148150
python -c "import mkl_umath, numpy as np; mkl_umath.use_in_numpy(); np.sin(np.linspace(0, 1, num=10**6));"
149151
150152
- name: Run tests
151153
run: |
152154
source "$CONDA/etc/profile.d/conda.sh"
153-
conda activate test_mkl_umath
154-
pytest -v --pyargs ${{ env.PACKAGE_NAME }}
155+
conda activate "${{ env.TEST_ENV_NAME }}"
156+
pytest -v --pyargs ${{ env.MODULE_NAME }}
155157
156158
build_windows:
157159
runs-on: windows-latest
158-
160+
defaults:
161+
run:
162+
shell: cmd /C CALL {0}
159163
strategy:
160164
matrix:
161165
include:
@@ -183,11 +187,9 @@ jobs:
183187

184188
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
185189
with:
186-
miniforge-variant: Miniforge3
187190
miniforge-version: latest
188191
activate-environment: build
189192
channels: conda-forge
190-
conda-remove-defaults: "true"
191193
python-version: ${{ matrix.python }}
192194

193195
- name: Cache conda packages
@@ -209,13 +211,11 @@ jobs:
209211
210212
- name: Install conda build
211213
run: |
212-
conda activate
213-
conda install -y conda-build
214+
conda install -n base -y conda-build
214215
conda list -n base
215216
216217
- name: Build conda package
217218
run: |
218-
conda activate
219219
conda build --no-test --python ${{ matrix.python }} --numpy ${{ matrix.numpy }} -c conda-forge --override-channels conda-recipe-cf
220220
221221
- name: Upload artifact
@@ -249,11 +249,9 @@ jobs:
249249

250250
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
251251
with:
252-
miniforge-variant: Miniforge3
253252
miniforge-version: latest
254-
activate-environment: mkl_umath_test
255253
channels: conda-forge
256-
conda-remove-defaults: "true"
254+
activate-environment: ${{ env.TEST_ENV_NAME }}
257255
python-version: ${{ matrix.python }}
258256

259257
- name: Install conda-index
@@ -303,7 +301,7 @@ jobs:
303301
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
304302
SET PACKAGE_VERSION=%%F
305303
)
306-
conda install -n mkl_umath_test ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
304+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
307305
308306
- name: Display lockfile content
309307
shell: pwsh
@@ -332,25 +330,24 @@ jobs:
332330
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
333331
SET PACKAGE_VERSION=%%F
334332
)
335-
conda install -n mkl_umath_test ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% pytest python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
333+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% pytest python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
336334
337335
- name: Report content of test environment
338336
shell: cmd /C CALL {0}
339337
run: |
340-
conda activate
341338
echo "Value of CONDA environment variable was: " %CONDA%
342339
echo "Value of CONDA_PREFIX environment variable was: " %CONDA_PREFIX%
343-
conda info && conda list -n mkl_umath_test
340+
conda info && conda list -n ${{ env.TEST_ENV_NAME }}
344341
345342
- name: Smoke test
346343
shell: cmd /C CALL {0}
347344
run: |
348345
@ECHO ON
349-
conda activate mkl_umath_test
346+
conda activate ${{ env.TEST_ENV_NAME }}
350347
python -c "import mkl_umath, numpy as np; mkl_umath.use_in_numpy(); np.sin(np.linspace(0, 1, num=10**6));"
351348
352349
- name: Run tests
353350
shell: cmd /C CALL {0}
354351
run: |
355-
conda activate mkl_umath_test
356-
python -m pytest -v -s --pyargs ${{ env.PACKAGE_NAME }}
352+
conda activate ${{ env.TEST_ENV_NAME }}
353+
python -m pytest -v -s --pyargs ${{ env.MODULE_NAME }}

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ permissions: read-all
1010

1111
env:
1212
PACKAGE_NAME: mkl_umath
13+
MODULE_NAME: mkl_umath
14+
TEST_ENV_NAME: test_mkl_umath
1315
VER_SCRIPT1: "import json; f = open('ver.json', 'r'); j = json.load(f); f.close(); d = j['mkl_umath'][0];"
1416
VER_SCRIPT2: "print('='.join((d[s] for s in ('version', 'build'))))"
1517

@@ -102,7 +104,7 @@ jobs:
102104
- name: Collect dependencies
103105
run: |
104106
CHANNELS=(-c "$GITHUB_WORKSPACE/channel" -c "https://software.repos.intel.com/python/conda" -c "conda-forge" --override-channels)
105-
conda create -n test_mkl_umath "$PACKAGE_NAME" "python=${{ matrix.python }}" "${CHANNELS[@]}" --only-deps --dry-run > lockfile
107+
conda create -n "${{ env.TEST_ENV_NAME }}" "$PACKAGE_NAME" "python=${{ matrix.python }}" "${CHANNELS[@]}" --only-deps --dry-run > lockfile
106108
- name: Display lockfile
107109
run: cat lockfile
108110

@@ -125,25 +127,27 @@ jobs:
125127
- name: Install mkl_umath
126128
run: |
127129
CHANNELS=(-c "$GITHUB_WORKSPACE/channel" -c "https://software.repos.intel.com/python/conda" -c "conda-forge" --override-channels)
128-
conda create -n test_mkl_umath "python=${{ matrix.python }}" "$PACKAGE_NAME" pytest "${CHANNELS[@]}"
130+
conda create -n "${{ env.TEST_ENV_NAME }}" "python=${{ matrix.python }}" "$PACKAGE_NAME" pytest "${CHANNELS[@]}"
129131
# Test installed packages
130-
conda list -n test_mkl_umath
132+
conda list -n "${{ env.TEST_ENV_NAME }}"
131133
132134
- name: Smoke test
133135
run: |
134136
source "$CONDA/etc/profile.d/conda.sh"
135-
conda activate test_mkl_umath
137+
conda activate "${{ env.TEST_ENV_NAME }}"
136138
python -c "import mkl_umath, numpy as np; mkl_umath.use_in_numpy(); np.sin(np.linspace(0, 1, num=10**6));"
137139
138140
- name: Run tests
139141
run: |
140142
source "$CONDA/etc/profile.d/conda.sh"
141-
conda activate test_mkl_umath
143+
conda activate "${{ env.TEST_ENV_NAME }}"
142144
pytest -v --pyargs ${{ env.PACKAGE_NAME }}
143145
144146
build_windows:
145147
runs-on: windows-latest
146-
148+
defaults:
149+
run:
150+
shell: cmd /C CALL {0}
147151
strategy:
148152
matrix:
149153
python: ["3.10", "3.11", "3.12", "3.13", "3.14"]
@@ -160,11 +164,9 @@ jobs:
160164

161165
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
162166
with:
163-
miniforge-variant: Miniforge3
164167
miniforge-version: latest
165168
activate-environment: build
166169
channels: conda-forge
167-
conda-remove-defaults: "true"
168170
python-version: ${{ matrix.python }}
169171

170172
- name: Cache conda packages
@@ -186,13 +188,11 @@ jobs:
186188
187189
- name: Install conda build
188190
run: |
189-
conda activate
190-
conda install -y conda-build
191+
conda install -n base -y conda-build
191192
conda list -n base
192193
193194
- name: Build conda package
194195
run: |
195-
conda activate
196196
conda build --no-test --python ${{ matrix.python }} -c https://software.repos.intel.com/python/conda -c conda-forge --override-channels conda-recipe
197197
198198
- name: Upload artifact
@@ -225,11 +225,9 @@ jobs:
225225

226226
- uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
227227
with:
228-
miniforge-variant: Miniforge3
229228
miniforge-version: latest
230-
activate-environment: mkl_umath_test
231229
channels: conda-forge
232-
conda-remove-defaults: "true"
230+
activate-environment: ${{ env.TEST_ENV_NAME }}
233231
python-version: ${{ matrix.python }}
234232

235233
- name: Install conda-index
@@ -279,7 +277,7 @@ jobs:
279277
FOR /F "tokens=* USEBACKQ" %%F IN (`python -c "%SCRIPT%"`) DO (
280278
SET PACKAGE_VERSION=%%F
281279
)
282-
conda install -n mkl_umath_test ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
280+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }} --only-deps --dry-run > lockfile
283281
284282
- name: Display lockfile content
285283
shell: pwsh
@@ -313,25 +311,25 @@ jobs:
313311
SET "TEST_DEPENDENCIES=pytest pytest-cov"
314312
SET "WORKAROUND_DEPENDENCIES=intel-openmp"
315313
SET "DEPENDENCIES=%TEST_DEPENDENCIES% %WORKAROUND_DEPENDENCIES%"
316-
conda install -n mkl_umath_test ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
314+
conda install -n ${{ env.TEST_ENV_NAME }} ${{ env.PACKAGE_NAME }}=%PACKAGE_VERSION% %DEPENDENCIES% python=${{ matrix.python }} -c ${{ env.workdir }}/channel ${{ env.CHANNELS }}
317315
318316
- name: Report content of test environment
319317
shell: cmd /C CALL {0}
320318
run: |
321319
conda activate
322320
echo "Value of CONDA environment variable was: " %CONDA%
323321
echo "Value of CONDA_PREFIX environment variable was: " %CONDA_PREFIX%
324-
conda info && conda list -n mkl_umath_test
322+
conda info && conda list -n ${{ env.TEST_ENV_NAME }}
325323
326324
- name: Smoke test
327325
shell: cmd /C CALL {0}
328326
run: |
329327
@ECHO ON
330-
conda activate mkl_umath_test
328+
conda activate ${{ env.TEST_ENV_NAME }}
331329
python -c "import mkl_umath, numpy as np; mkl_umath.use_in_numpy(); np.sin(np.linspace(0, 1, num=10**6));"
332330
333331
- name: Run tests
334332
shell: cmd /C CALL {0}
335333
run: |
336-
conda activate mkl_umath_test
337-
python -m pytest -v -s --pyargs ${{ env.PACKAGE_NAME }}
334+
conda activate ${{ env.TEST_ENV_NAME }}
335+
python -m pytest -v -s --pyargs ${{ env.MODULE_NAME }}

0 commit comments

Comments
 (0)