Take 2 on Ubuntu, better handling of extension code
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Anne de Jong 2023-01-12 19:49:32 +01:00
parent f012244091
commit e86913a208
2 changed files with 11 additions and 9 deletions

View File

@ -1,12 +1,12 @@
kind: pipeline kind: pipeline
type: docker type: docker
name: archlinux_build name: archlinux
clone: clone:
depth: 50 depth: 50
steps: steps:
- name: build-arch - name: archlinux_build
image: archlinux_build image: archlinux_build
pull: if-not-exists pull: if-not-exists
volumes: volumes:
@ -19,7 +19,7 @@ steps:
# More than two makes ascee2 irresponsive for now # More than two makes ascee2 irresponsive for now
- make -j2 - make -j2
- name: test-arch - name: archlinux_test
image: archlinux_build image: archlinux_build
pull: if-not-exists pull: if-not-exists
commands: commands:
@ -40,7 +40,7 @@ volumes:
--- ---
kind: pipeline kind: pipeline
type: docker type: docker
name: ubuntu_build name: ubuntu
clone: clone:
depth: 3 depth: 3
@ -50,7 +50,7 @@ volumes:
path: /root/.ccache path: /root/.ccache
steps: steps:
- name: build-ubuntu - name: ubuntu_build
image: ubuntu image: ubuntu
pull: if-not-exists pull: if-not-exists
volumes: volumes:
@ -58,18 +58,18 @@ steps:
path: /root/.ccache path: /root/.ccache
commands: commands:
- apt update - apt update
- apt install -y git python3-pybind11 libopenblas-dev python3-pip python3-scipy libusb-1.0-0-dev libpulse-dev python3-h5py fftw-dev - apt install -y git cmake python3-pybind11 libopenblas-dev python3-pip python3-scipy libusb-1.0-0-dev libpulse-dev python3-h5py fftw-dev
- git submodule update --init --recursive - git submodule update --init --recursive
- cmake . - cmake .
# More than two makes ascee2 irresponsive for now # More than two makes ascee2 irresponsive for now
- make -j2 - make -j2
- name: test-ubuntu - name: ubuntu_test
image: ubuntu_build image: ubuntu
pull: if-not-exists pull: if-not-exists
commands: commands:
- apt update - apt update
- apt install -y python3-pytest fftw pulseaudio python3-pip python3-scipy - apt install -y python3-pytest fftw pulseaudio python3-pip python3-scipy python3-h5py
- pip install -r requirements.txt - pip install -r requirements.txt
- pip install . - pip install .
- pytest-3 - pytest-3

View File

@ -6,6 +6,8 @@ from setuptools import setup
if 'Linux' in platform.platform(): if 'Linux' in platform.platform():
ext_name_glob = 'lasp_cpp.cpython*' ext_name_glob = 'lasp_cpp.cpython*'
extensions = list(glob.glob('src/lasp/' + ext_name_glob)) extensions = list(glob.glob('src/lasp/' + ext_name_glob))
# Split of path from file.
ext_names = [os.path.split(a)[1] for a in extensions] ext_names = [os.path.split(a)[1] for a in extensions]
print(extensions) print(extensions)