8000 CI: GitHub Actions CI job restructuring by rgommers · Pull Request #24493 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

CI: GitHub Actions CI job restructuring #24493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 22, 2023
Merged

CI: GitHub Actions CI job restructuring #24493

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b259458
CI: move some jobs in `build_test.yml` to Meson
rgommers Aug 13, 2023
ed1aac0
CI: merge the two GitHub Actions files for Windows builds
rgommers Aug 22, 2023
1a81895
CI: split `build_test.yml` into three GHA jobs files
rgommers Aug 22, 2023
6d34380
CI: merge `linux_meson.yml` into `linux_blas.yml`
rgommers Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
CI: merge the two GitHub Actions files for Windows builds
  • Loading branch information
@rgommers
rgommers committed Aug 22, 2023
commit ed1aac08730da9814887339f31b24aa8a953e590
28 changes: 20 additions & 8 deletions .github/workflows/windows_meson.yml → .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
name: Test Meson build (Windows)
name: Windows tests

on:
pull_request:
branches:
- main
- maintenance/**

env:
PYTHON_VERSION: 3.11

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true
Expand All @@ -17,10 +14,13 @@ permissions:
contents: read # to fetch code (actions/checkout)

jobs:
msvc_64bit_python_openblas:
name: MSVC, x86-64, LP64 OpenBLAS
python64bit_openblas:
name: x86-64, LP64 OpenBLAS
runs-on: windows-2019
if: "github.repository == 'numpy/numpy'"
strategy:
matrix:
compiler: ["MSVC", "Clang-cl"]
steps:
- name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
Expand All @@ -31,7 +31,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4.7.0
with:
python-version: ${{ env.PYTHON_VERSION }}
python-version: '3.11'

- name: Install build dependencies from PyPI
run: |
Expand All @@ -48,10 +48,22 @@ jobs:
unzip -d c:\opt openblas-v0.3.21-win_amd64-gcc_10_3_0.zip
echo "PKG_CONFIG_PATH=c:\opt\64\lib\pkgconfig;" >> $env:GITHUB_ENV

- name: Install NumPy
- name: Install Clang-cl
if: matrix.compiler == 'Clang-cl'
run: |
choco install llvm -y --version=16.0.6

- name: Install NumPy (MSVC)
if: matrix.compiler == 'MSVC'
run: |
spin build -j2 -- --vsenv

- name: Install NumPy (Clang-cl)
if: matrix.compiler == 'Clang-cl'
run: |
"[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
spin build -j2 -- --vsenv --native-file=$PWD/clang-cl-build.ini

- name: Copy OpenBLAS DLL, write _distributor_init.py
run: |
# Getting the OpenBLAS DLL to the right place so it loads
Expand Down
82 changes: 0 additions & 82 deletions .github/workflows/windows_clangcl.yml
View file
Open in desktop

This file was deleted.

0