aboutsummaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-02-08 18:09:04 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2020-02-20 13:38:45 +0100
commit96f5d4e455af3eb0c296b190727b0d76014c7534 (patch)
treed7bfbb9609b2577d896898c5871df3787a9330cc /.github
parent08224dafcba1b694fb624553e7d84deb565aae22 (diff)
downloadmeson-96f5d4e455af3eb0c296b190727b0d76014c7534.zip
meson-96f5d4e455af3eb0c296b190727b0d76014c7534.tar.gz
meson-96f5d4e455af3eb0c296b190727b0d76014c7534.tar.bz2
boost: Updated tests
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/lint_mypy.yml2
-rw-r--r--.github/workflows/os_comp.yml8
2 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/lint_mypy.yml b/.github/workflows/lint_mypy.yml
index b76a751..54535b3 100644
--- a/.github/workflows/lint_mypy.yml
+++ b/.github/workflows/lint_mypy.yml
@@ -30,4 +30,4 @@ jobs:
with:
python-version: '3.x'
- run: python -m pip install mypy
- - run: mypy --follow-imports=skip mesonbuild/mtest.py mesonbuild/minit.py mesonbuild/mintro.py mesonbuild/msetup.py mesonbuild/wrap tools/ mesonbuild/modules/fs.py mesonbuild/dependencies/mpi.py mesonbuild/dependencies/hdf5.py mesonbuild/compilers/mixins/intel.py
+ - run: mypy --follow-imports=skip mesonbuild/mtest.py mesonbuild/minit.py mesonbuild/mintro.py mesonbuild/msetup.py mesonbuild/wrap tools/ mesonbuild/modules/fs.py mesonbuild/dependencies/boost.py mesonbuild/dependencies/mpi.py mesonbuild/dependencies/hdf5.py mesonbuild/compilers/mixins/intel.py
diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
index dcbbdde..19281c9 100644
--- a/.github/workflows/os_comp.yml
+++ b/.github/workflows/os_comp.yml
@@ -11,9 +11,7 @@ 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 python-dev python3-dev libboost-all-dev
- - name: Remove GitHub boost version
- run: sudo rm -rf /usr/local/share/boost
+ sudo apt install -yq --no-install-recommends python3-setuptools python3-pip g++ gfortran gobjc gobjc++ zlib1g-dev python-dev python3-dev
- name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v1
- name: Python version
@@ -21,7 +19,7 @@ jobs:
- name: Ninja version
run: ninja --version
- name: Run tests
- run: python3 run_tests.py
+ run: LD_LIBRARY_PATH=/usr/local/share/boost/1.69.0/lib/:$LD_LIBRARY_PATH python3 run_tests.py
env:
CI: '1'
XENIAL: '1'
@@ -48,6 +46,7 @@ jobs:
env:
CI: '1'
SKIP_SCIENTIFIC: '1'
+ SKIP_STATIC_BOOST: '1'
opensuse:
name: OpenSUSE
@@ -60,3 +59,4 @@ jobs:
env:
CI: '1'
SKIP_SCIENTIFIC: '1'
+ SKIP_STATIC_BOOST: '1'