8000 CI: merge the two GitHub Actions files for Windows builds · numpy/numpy@ed1aac0 · GitHub
[go: up one dir, main page]
Skip to content

Commit ed1aac0

Browse files
rgommersrgommers
committed
CI: merge the two GitHub Actions files for Windows builds
1 parent b259458 commit ed1aac0

File tree

2 files changed

+20
-90
lines changed

2 files changed

+20
-90
lines changed

‎.github/workflows/windows_meson.yml renamed to ‎.github/workflows/windows.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
name: Test Meson build (Windows)
1+
name: Windows tests
22

33
on:
44
pull_request:
55
branches:
66
- main
77
- maintenance/**
88

9-
env:
10-
PYTHON_VERSION: 3.11
11-
129
concurrency:
1310
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
1411
cancel-in-progress: true
@@ -17,10 +14,13 @@ permissions:
1714
contents: read # to fetch code (actions/checkout)
1815

1916
jobs:
20-
msvc_64bit_python_openblas:
21-
name: MSVC, x86-64, LP64 OpenBLAS
17+
python64bit_openblas:
18+
name: x86-64, LP64 OpenBLAS
2219
runs-on: windows-2019
2320
if: "github.repository == 'numpy/numpy'"
21+
strategy:
22+
matrix:
23+
compiler: ["MSVC", "Clang-cl"]
2424
steps:
2525
- name: Checkout
2626
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Python
3232
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
3333
with:
34-
python-version: ${{ env.PYTHON_VERSION }}
34+
python-version: '3.11'
3535

3636
- name: Install build dependencies from PyPI
3737
run: |
@@ -48,10 +48,22 @@ jobs:
4848
unzip -d c:\opt openblas-v0.3.21-win_amd64-gcc_10_3_0.zip
4949
echo "PKG_CONFIG_PATH=c:\opt\64\lib\pkgconfig;" >> $env:GITHUB_ENV
5050
51-
- name: Install NumPy
51+
- name: Install Clang-cl
52+
if: matrix.compiler == 'Clang-cl'
53+
run: |
54+
choco install llvm -y --version=16.0.6
55+
56+
- name: Install NumPy (MSVC)
57+
if: matrix.compiler == 'MSVC'
5258
run: |
5359
spin build -j2 -- --vsenv
5460
61+
- name: Install NumPy (Clang-cl)
62+
if: matrix.compiler == 'Clang-cl'
63+
run: |
64+
"[binaries]","c = 'clang-cl'","cpp = 'clang-cl'","ar = 'llvm-lib'","c_ld = 'lld-link'","cpp_ld = 'lld-link'" | Out-File $PWD/clang-cl-build.ini -Encoding ascii
65+
spin build -j2 -- --vsenv --native-file=$PWD/clang-cl-build.ini
66+
5567
- name: Copy OpenBLAS DLL, write _distributor_init.py
5668
run: |
5769
# Getting the OpenBLAS DLL to the right place so it loads

‎.github/workflows/windows_clangcl.yml

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

0 commit comments

Comments
 (0)
0