Skip to content

Commit 82e3f04

Browse files
authored
Merge pull request #201 from matthew-brett/rename-build-bits
Refactor confusing BUILD_BITS variable in CI
2 parents 8bb8a5e + 582b0b0 commit 82e3f04

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

.github/workflows/windows-arm.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,10 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
include:
26-
- INTERFACE64: 1
27-
BUILD_BITS: 64
28-
- INTERFACE64: 0
29-
BUILD_BITS: 32
25+
INTERFACE64: ['1', '0']
3026

3127
env:
3228
INTERFACE64: ${{ matrix.INTERFACE64 }}
33-
BUILD_BITS: ${{ matrix.BUILD_BITS }}
3429

3530
steps:
3631

@@ -62,22 +57,30 @@ jobs:
6257
pip install cmake
6358
get-command cmake
6459
60+
- name: Set env variables
61+
run: |
62+
if ( ${{ matrix.INTERFACE64 }} -eq "1" ) {
63+
echo "INTERFACE_BITS=64" >> $env:GITHUB_ENV
64+
} else {
65+
echo "INTERFACE_BITS=32" >> $env:GITHUB_ENV
66+
}
67+
6568
- name: Build
6669
run: |
6770
git submodule update --init --recursive
68-
if ($env:INTERFACE64 -eq "1") { .\tools\build_steps_win_arm64.bat 64 64 } else { .\tools\build_steps_win_arm64.bat }
71+
.\tools\build_steps_win_arm64.bat 64 ${env:INTERFACE_BITS}
6972
7073
- name: Pack
7174
run: |
7275
cd local
73-
cp -r "scipy_openblas${env:BUILD_BITS}" $env:BUILD_BITS
74-
7z a ../builds/openblas-${env:PLAT}-${env:INTERFACE64}.zip -tzip $env:BUILD_BITS
76+
cp -r "scipy_openblas${env:INTERFACE_BITS}" $env:INTERFACE_BITS
77+
7z a ../builds/openblas-${env:PLAT}-${env:INTERFACE64}.zip -tzip $env:INTERFACE_BITS
7578
76-
- name: Test ${{ matrix.BUILD_BITS }}-bit interface wheel
79+
- name: Test ${{ matrix.INTERFACE_BITS }}-bit interface wheel
7780
run: |
78-
python -m pip install --no-index --find-links dist scipy_openblas${env:BUILD_BITS}
79-
python -m scipy_openblas${env:BUILD_BITS}
80-
python -c "import scipy_openblas${env:BUILD_BITS}; print(scipy_openblas${env:BUILD_BITS}.get_pkg_config())"
81+
python -m pip install --no-index --find-links dist scipy_openblas${env:INTERFACE_BITS}
82+
python -m scipy_openblas${env:INTERFACE_BITS}
83+
python -c "import scipy_openblas${env:INTERFACE_BITS}; print(scipy_openblas${env:INTERFACE_BITS}.get_pkg_config())"
8184
8285
- uses: actions/[email protected]
8386
with:

0 commit comments

Comments
 (0)