Skip to content

Commit 0f1eb19

Browse files
committed
CI: refactor windows_arm64_steps
1 parent 2c5bc07 commit 0f1eb19

4 files changed

Lines changed: 10 additions & 25 deletions

File tree

.github/windows_arm64_steps/action.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/wheels.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,17 @@ jobs:
9595
with:
9696
architecture: 'x86'
9797

98-
- name: Setup LLVM for Windows ARM64
98+
- name: win_arm64 - set environment variables
9999
if: ${{ matrix.buildplat[1] == 'win_arm64' }}
100-
uses: ./.github/windows_arm64_steps
100+
run: |
101+
echo "C:\Program Files\LLVM\bin" >> $env:GIHUB_PATH
102+
echo "CC=clang-cl" >> $env:GITHUB_ENV
103+
echo "CXX=clang-cl" >> $env:GITHUB_ENV
104+
echo "FC=flang" >> $env:GITHUB_ENV
101105
102106
- name: pkg-config-for-win
103107
if: runner.os == 'windows'
104108
run: |
105-
choco install -y --no-progress --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
106109
$CIBW = "${{ github.workspace }}/.openblas"
107110
# pkgconfig needs a complete path, and not just "./openblas since the
108111
# build is run in a tmp dir (?)
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pkgconf==2.5.1.post1

tools/wheels/cibw_before_build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,7 @@ fi
6161
# cibuildwheel doesn't install delvewheel by default
6262
if [[ $RUNNER_OS == "Windows" ]]; then
6363
python -m pip install -r $PROJECT_DIR/requirements/delvewheel_requirements.txt
64+
# pkgconf - carries out the role of pkg-config.
65+
# Alternative is pkgconfiglite that you have to install with choco
66+
python -m pip install -r $PROJECT_DIR/requirements/pkgconf.txt
6467
fi

0 commit comments

Comments
 (0)