Skip to content

Commit f29095e

Browse files
committed
fixing local CI
1 parent ca9f75a commit f29095e

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Numpy User DTypes CI
33
on:
44
push:
55
branches:
6-
- main
6+
- uni-workflow
77
pull_request:
88
workflow_dispatch:
99

@@ -66,6 +66,7 @@ jobs:
6666
cmake -S . -B build -DSLEEF_BUILD_QUAD:BOOL=ON -DSLEEF_BUILD_SHARED_LIBS:BOOL=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON
6767
cmake --build build/ --clean-first -j
6868
sudo cmake --install build --prefix /usr
69+
export SLEEF_PATH=/usr
6970
- name: Install quaddtype
7071
working-directory: quaddtype
7172
run: |

h

Lines changed: 0 additions & 1 deletion
This file was deleted.

quaddtype/meson.build

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,8 @@ py = py_mod.find_installation()
55

66
c = meson.get_compiler('c')
77

8-
# Get the SLEEF path
9-
sleef_path = run_command('bash', '-c', 'echo $SLEEF_PATH', check: false).stdout().strip()
10-
if sleef_path == ''
11-
sleef_path = run_command('bash', '-c', 'echo $CONDA_PREFIX', check: false).stdout().strip()
12-
endif
13-
14-
if sleef_path == ''
15-
error('SLEEF_PATH or CONDA_PREFIX environment variable is not set')
16-
endif
17-
188
is_windows = build_machine.system() == 'windows'
199

20-
# Add SLEEF lib directory to library path
21-
add_project_link_arguments('-L' + sleef_path + '/lib', language: ['c', 'cpp'])
22-
2310
incdir_numpy = ''
2411
if is_windows
2512
add_project_arguments('-DWIN32', '-D_WINDOWS', language : ['c', 'cpp'])
@@ -39,6 +26,16 @@ if is_windows
3926
dependencies: [sleef_lib, sleefquad_lib])
4027
else
4128
# Linux and macOS configuration
29+
sleef_path = run_command('bash', '-c', 'echo $SLEEF_PATH', check: false).stdout().strip()
30+
if sleef_path == ''
31+
sleef_path = run_command('bash', '-c', 'echo $CONDA_PREFIX', check: false).stdout().strip()
32+
endif
33+
if sleef_path == ''
34+
error('SLEEF_PATH or CONDA_PREFIX environment variable is not set')
35+
endif
36+
37+
add_project_link_arguments('-L' + sleef_path + '/lib', language: ['c', 'cpp'])
38+
4239
sleef_include_dir = sleef_path + '/include'
4340
sleef_library_dir = sleef_path + '/lib'
4441

0 commit comments

Comments
 (0)