diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-01-23 16:10:07 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-01-24 02:53:34 +0530 |
| commit | a78f90c3f8c6eb17d70b02636ebd2cb878cb3198 (patch) | |
| tree | c77726e6436e74ed19f9305ae21daffba637f4fd | |
| parent | ca1776d6db1b475a23e8bc4bcd444d74a64e69d0 (diff) | |
| download | meson-a78f90c3f8c6eb17d70b02636ebd2cb878cb3198.zip meson-a78f90c3f8c6eb17d70b02636ebd2cb878cb3198.tar.gz meson-a78f90c3f8c6eb17d70b02636ebd2cb878cb3198.tar.bz2 | |
ci: Fix boost test on xenial
| -rw-r--r-- | .github/workflows/os_comp.yml | 5 | ||||
| -rw-r--r-- | test cases/frameworks/1 boost/meson.build | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml index 505fe98..387b9c1 100644 --- a/.github/workflows/os_comp.yml +++ b/.github/workflows/os_comp.yml @@ -11,8 +11,9 @@ jobs: - name: Install Dependencies run: | sudo apt update -yq - sudo apt install -yq --no-install-recommends python3-setuptools python3-pip g++ gfortran gobjc gobjc++ zlib1g-dev - sudo python3 -m pip install pytest-xdist pytest-forked pytest + sudo apt install -yq --no-install-recommends python3-setuptools python3-pip g++ gfortran gobjc gobjc++ zlib1g-dev python-dev python3-dev libboost-all-dev + - name: Remove GitHub boost version + run: sudo rm -rf /usr/local/share/boost - name: Install ninja-build tool uses: seanmiddleditch/gha-setup-ninja@v1 - name: Python version diff --git a/test cases/frameworks/1 boost/meson.build b/test cases/frameworks/1 boost/meson.build index 2dce40d..eec8728 100644 --- a/test cases/frameworks/1 boost/meson.build +++ b/test cases/frameworks/1 boost/meson.build @@ -82,7 +82,7 @@ test('Boost extralib test', extralibexe) python2interpreter = find_program(python2.path(), required: false, disabler: true) test('Boost Python2', python2interpreter, args: ['./test_python_module.py', meson.current_build_dir()], workdir: meson.current_source_dir(), depends: python2module) python3interpreter = find_program(python3.path(), required: false, disabler: true) -test('Boost Python3', python3interpreter, args: ['./test_python_module.py', meson.current_build_dir()], workdir: meson.current_source_dir(), depends: python2module) +test('Boost Python3', python3interpreter, args: ['./test_python_module.py', meson.current_build_dir()], workdir: meson.current_source_dir(), depends: python3module) subdir('partial_dep') |