Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: try to install urld harder for opensuse, ubuntu #13550

Merged
merged 4 commits into from
Aug 19, 2024
Merged

ci: try to install urld harder for opensuse, ubuntu #13550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca73422
ci: try to install urld harder for opensuse, ubuntu
thesamesam Aug 16, 2024
9f85279
ci: opensuse: add setuptools
thesamesam Aug 16, 2024
9c3dcea
ci: skip frameworks/17 mpi for auto/pkgconfig on Ubuntu
thesamesam Aug 19, 2024
cdf646f
ci: ubuntu: fix coverage unittests by patching/updating lcov
thesamesam Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ci/ciimage/opensuse/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
source /ci/common.sh

pkgs=(
python3-pip python3 python3-devel
python3-pip python3 python3-devel python3-setuptools
ninja make git autoconf automake patch libjpeg-devel
elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-obj-c++ vala rust bison flex curl lcov
mono-core gtkmm3-devel gtest gmock protobuf-devel wxGTK3-3_2-devel gobject-introspection-devel
Expand Down Expand Up @@ -39,7 +39,7 @@ chmod +x /ci/env_vars.sh
source /ci/env_vars.sh

dub_fetch urld
dub build urld --compiler=dmd
dub build --deep urld --arch=x86_64 --compiler=dmd --build=debug
dub_fetch dubtestproject
dub build dubtestproject:test1 --compiler=dmd
dub build dubtestproject:test2 --compiler=dmd
Expand Down
9 changes: 8 additions & 1 deletion ci/ciimage/ubuntu-rolling/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install_python_packages hotdoc

# dub stuff
dub_fetch urld
dub build urld --compiler=gdc
dub build --deep urld --arch=x86_64 --compiler=gdc --build=debug
dub_fetch dubtestproject
dub build dubtestproject:test1 --compiler=ldc2
dub build dubtestproject:test2 --compiler=ldc2
Expand Down Expand Up @@ -82,6 +82,13 @@ cp LICENSE /usr/share/doc/zig
cd ..
rm -rf "$ZIG_BASE"

# Hack for https://github.com/linux-test-project/lcov/issues/245
# https://github.com/linux-test-project/lcov/commit/bf135caf5f626e02191c42bd2773e08a0bb9b7e5
# XXX: Drop this once Ubuntu has lcov-2.1*
git clone https://github.com/linux-test-project/lcov
cd lcov
make install

# cleanup
apt-get -y clean
apt-get -y autoclean
10 changes: 10 additions & 0 deletions test cases/frameworks/17 mpi/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ test('MPI C++', execpp, timeout: 20)


if add_languages('fortran', required : false)
if method in ['auto', 'pkg-config']
# https://bugs.debian.org/1078026
fs = import('fs')
if fs.exists('/usr/lib/x86_64-linux-gnu/pkgconfig/ompi-fort.pc')
if fs.hash('/usr/lib/x86_64-linux-gnu/pkgconfig/ompi-fort.pc', 'md5') == '0892a93630e3d3359c43c58d5a82efc0'
error('MESON_SKIP_TEST: openmpi pkgconfig file is broken on Debian/Ubuntu')
endif
endif
endif

fc = meson.get_compiler('fortran')
mpif = dependency('mpi', language : 'fortran', required: false, method : method)
if not fc.links('use mpi; end', dependencies: mpif, name: 'Fortran MPI')
Expand Down
6 changes: 4 additions & 2 deletions test cases/frameworks/17 mpi/test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@
"matrix": {
"options": {
"method": [
{ "val": "auto" },
{ "val": "pkg-config" },
{ "val": "auto",
"expect_skip_on_jobname": ["ubuntu"] },
{ "val": "pkg-config",
"expect_skip_on_jobname": ["ubuntu"] },
{ "val": "config-tool",
"expect_skip_on_jobname": ["fedora"] },
{
Expand Down
Loading