From 91a9711db3468ec930c7b605a9d109038b74eaa4 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Wed, 1 Jun 2022 21:01:43 +0800 Subject: [PATCH] Fix CI for macOS. --- .github/workflows/nightly-tests-macos-cpu.yml | 7 +++++++ .github/workflows/nightly-tests-ubuntu-cpu.yml | 11 ++++++++++- CMakeLists.txt | 12 +++++++----- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly-tests-macos-cpu.yml b/.github/workflows/nightly-tests-macos-cpu.yml index 95bd821..3655732 100644 --- a/.github/workflows/nightly-tests-macos-cpu.yml +++ b/.github/workflows/nightly-tests-macos-cpu.yml @@ -83,5 +83,12 @@ jobs: - name: Run tests shell: bash run: | + lib_path=$(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") + echo "lib_path: $lib_path" + ls -lh $lib_path + # export DYLD_LIBRARY_PATH=$lib_path:$DYLD_LIBRARY_PATH + otool -L $lib_path/_kaldifeat.*.so + otool -l $lib_path/_kaldifeat.*.so + cd kaldifeat/python/tests make test diff --git a/.github/workflows/nightly-tests-ubuntu-cpu.yml b/.github/workflows/nightly-tests-ubuntu-cpu.yml index 0fd0490..ce067fd 100644 --- a/.github/workflows/nightly-tests-ubuntu-cpu.yml +++ b/.github/workflows/nightly-tests-ubuntu-cpu.yml @@ -19,7 +19,16 @@ name: Nightly tests ubuntu cpu on: push: branches: - - nightly-test + - nightly-test-2 + + schedule: + # minute (0-59) + # hour (0-23) + # day of the month (1-31) + # month (1-12) + # day of the week (0-6) + # nightly build at 23:50 UTC time every day + - cron: "50 23 * * *" jobs: generate_build_matrix: diff --git a/CMakeLists.txt b/CMakeLists.txt index 380338b..810e4ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,11 +12,13 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") -set(CMAKE_SKIP_BUILD_RPATH FALSE) -set(BUILD_RPATH_USE_ORIGIN TRUE) -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -set(CMAKE_INSTALL_RPATH "$ORIGIN") -set(CMAKE_BUILD_RPATH "$ORIGIN") +if(NOT APPLE) + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(BUILD_RPATH_USE_ORIGIN TRUE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_INSTALL_RPATH "$ORIGIN") + set(CMAKE_BUILD_RPATH "$ORIGIN") +endif9) set(BUILD_SHARED_LIBS ON) if(WIN32)