Commit 9cad8ba0 authored by Tomas Krizek's avatar Tomas Krizek

gitlabci: fix build:darwin in travis

parent 73317689
...@@ -131,13 +131,6 @@ kres-gen: ...@@ -131,13 +131,6 @@ kres-gen:
tags: tags:
- docker - docker
build:darwin:
<<: *test_nodep
when: delayed
start_in: 2 minutes
script:
- ci/travis.py ${CI_COMMIT_REF_NAME}
deckard: deckard:
<<: *test_flaky <<: *test_flaky
variables: variables:
...@@ -285,6 +278,15 @@ test:valgrind: ...@@ -285,6 +278,15 @@ test:valgrind:
# }}} # }}}
# extended {{{ # extended {{{
build:darwin:
<<: *test_nodep
stage: extended
when: delayed
start_in: 5 minutes # give the build in Travis CI time to finish
allow_failure: true # https://github.com/Homebrew/homebrew-core/issues/37169
script:
- ci/travis.py ${CI_COMMIT_REF_NAME}
pytests: pytests:
<<: *test_flaky <<: *test_flaky
stage: extended # use this stage to avoid clash with other resource-intensive jobs stage: extended # use this stage to avoid clash with other resource-intensive jobs
......
...@@ -8,6 +8,8 @@ addons: ...@@ -8,6 +8,8 @@ addons:
- luajit - luajit
- libuv - libuv
- lmdb - lmdb
- meson
update: true
compiler: compiler:
- clang - clang
notifications: notifications:
...@@ -19,7 +21,6 @@ matrix: ...@@ -19,7 +21,6 @@ matrix:
env: env:
global: global:
- KNOT_DNS_VERSION=v2.7.6 - KNOT_DNS_VERSION=v2.7.6
- DYLD_LIBRARY_PATH="${HOME}/.local/lib"
- MALLOC_CHECK_=3 - MALLOC_CHECK_=3
- MALLOC_PERTURB_=223 - MALLOC_PERTURB_=223
before_script: before_script:
...@@ -30,8 +31,9 @@ before_script: ...@@ -30,8 +31,9 @@ before_script:
- make -j2 install - make -j2 install
- cd .. - cd ..
script: script:
- CFLAGS="-O2 -g -fno-omit-frame-pointer -DDEBUG" make -j2 install check V=1 PREFIX=${HOME}/.local DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH} - meson build_darwin --default-library=static --buildtype=debugoptimized --prefix=${HOME}/.local -Dc_args='-fno-omit-frame-pointer'
- ./daemon/kresd -h - ninja -C build_darwin install
- ./daemon/kresd -V - ${HOME}/.local/usr/sbin/kresd -h
- echo "quit()" | ./daemon/kresd -a 127.0.0.1@53535 . - ${HOME}/.local/usr/sbin/kresd -V
- echo "quit()" | ${HOME}/.local/usr/sbin/kresd -a 127.0.0.1@53535 .
sudo: false sudo: false
...@@ -11,9 +11,7 @@ if not get_option('client').disabled() ...@@ -11,9 +11,7 @@ if not get_option('client').disabled()
libedit = dependency('libedit', required: false) libedit = dependency('libedit', required: false)
if libedit.found() if libedit.found()
build_client = true build_client = true
else else # darwin workaround: missing pkgconfig
# fallback lib
# TODO why call find_library? osx workaround?
libedit = meson.get_compiler('c').find_library('edit', required: get_option('client')) libedit = meson.get_compiler('c').find_library('edit', required: get_option('client'))
if libedit.found() if libedit.found()
build_client = true build_client = true
......
...@@ -14,7 +14,10 @@ libknot = dependency('libknot', version: knot_version) ...@@ -14,7 +14,10 @@ libknot = dependency('libknot', version: knot_version)
libdnssec = dependency('libdnssec', version: knot_version) libdnssec = dependency('libdnssec', version: knot_version)
libzscanner = dependency('libzscanner', version: knot_version) libzscanner = dependency('libzscanner', version: knot_version)
libuv = dependency('libuv', version: '>=1.7') libuv = dependency('libuv', version: '>=1.7')
lmdb = dependency('lmdb') lmdb = dependency('lmdb', required: false)
if not lmdb.found() # darwin workaround: missing pkgconfig
lmdb = meson.get_compiler('c').find_library('lmdb')
endif
gnutls = dependency('gnutls') gnutls = dependency('gnutls')
luajit = dependency('luajit') luajit = dependency('luajit')
message('------------------------------') message('------------------------------')
......
...@@ -5,17 +5,13 @@ mock_cmodule_src = files([ ...@@ -5,17 +5,13 @@ mock_cmodule_src = files([
'mock_cmodule.c', 'mock_cmodule.c',
]) ])
mock_cmodule_lib = shared_library( mock_cmodule_mod = shared_module(
'mock_cmodule', 'mock_cmodule',
mock_cmodule_src, mock_cmodule_src,
name_prefix: '', name_prefix: '',
dependencies: libkres_dep, dependencies: libkres_dep,
) )
mock_cmodule_dep = declare_dependency(
link_with: mock_cmodule_lib,
)
# executables with tests # executables with tests
foreach unit_test : unit_tests foreach unit_test : unit_tests
exec_test = executable( exec_test = executable(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment