Skip to content

Commit e429a9b

Browse files
committed
merging CI fixes
2 parents bca4df3 + fe8b540 commit e429a9b

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
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

@@ -69,7 +69,7 @@ jobs:
6969
- name: Install quaddtype
7070
working-directory: quaddtype
7171
run: |
72-
LDFLAGS="-Wl,-rpath,/usr/lib" python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug"
72+
export SLEEF_PATH=/usr && LDFLAGS="-Wl,-rpath,/usr/lib" python -m pip install . -v --no-build-isolation -Cbuilddir=build -C'compile-args=-v' -Csetup-args="-Dbuildtype=debug"
7373
- name: Run quaddtype tests
7474
working-directory: quaddtype
7575
run: |

h

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

quaddtype/meson.build

Lines changed: 13 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,19 @@ if is_windows
3926
dependencies: [sleef_lib, sleefquad_lib])
4027
else
4128
# Linux and macOS configuration
29+
30+
# Get the SLEEF path
31+
sleef_path = run_command('bash', '-c', 'echo $SLEEF_PATH', check: false).stdout().strip()
32+
if sleef_path == ''
33+
sleef_path = run_command('bash', '-c', 'echo $CONDA_PREFIX', check: false).stdout().strip()
34+
endif
35+
36+
if sleef_path == ''
37+
error('SLEEF_PATH or CONDA_PREFIX environment variable is not set')
38+
endif
39+
40+
add_project_link_arguments('-L' + sleef_path + '/lib', language: ['c', 'cpp'])
41+
4242
sleef_include_dir = sleef_path + '/include'
4343
sleef_library_dir = sleef_path + '/lib'
4444

0 commit comments

Comments
 (0)