Fixed PATH and modified CI to not fail fast on matrix builds

luxonis · Apr 29, 2022 · dda8efc · dda8efc
1 parent 52efa1b
commit dda8efc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -177,6 +177,7 @@ jobs:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
         python-architecture: [x64, x86]
+      fail-fast: false
     steps:
       - name: Cache .hunter folder
         uses: actions/cache@v2
@@ -230,6 +231,7 @@ jobs:
     strategy:
       matrix:
         python-version: [3.6, 3.7, 3.8, 3.9, '3.10']
+      fail-fast: false
     steps:
       - name: Cache .hunter folder
         uses: actions/cache@v2

diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
@@ -41,7 +41,7 @@ else()
         ${CMAKE_COMMAND} -E env
         # Environment variables
         # PATH (dlls)
-        "PATH=${HUNTER_INSTALL_PREFIX}${SYS_PATH_SEPARATOR}$ENV{PATH}"            
+        "PATH=${HUNTER_INSTALL_PREFIX}/bin${SYS_PATH_SEPARATOR}$ENV{PATH}"            
         # Python path (to find compiled module)
         "PYTHONPATH=$<TARGET_FILE_DIR:${TARGET_NAME}>${SYS_PATH_SEPARATOR}$ENV{PYTHONPATH}"
         # ASAN in case of sanitizers

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -34,7 +34,7 @@ function(add_python_example example_name python_script_path)
         ${CMAKE_COMMAND} -E env
         # Environment variables
         # PATH (dlls)
-        "PATH=${HUNTER_INSTALL_PREFIX}${SYS_PATH_SEPARATOR}$ENV{PATH}"
+        "PATH=${HUNTER_INSTALL_PREFIX}/bin${SYS_PATH_SEPARATOR}$ENV{PATH}"
         # Python path (to find compiled module)
         "PYTHONPATH=$<TARGET_FILE_DIR:${TARGET_NAME}>${SYS_PATH_SEPARATOR}$ENV{PYTHONPATH}"
         # ASAN in case of sanitizers
@@ -52,7 +52,7 @@ function(add_python_example example_name python_script_path)
         add_test(NAME ${example_name} COMMAND
             ${CMAKE_COMMAND} -E env
             # PATH (dlls)
-            "PATH=${HUNTER_INSTALL_PREFIX}${SYS_PATH_SEPARATOR}$ENV{PATH}"
+            "PATH=${HUNTER_INSTALL_PREFIX}/bin${SYS_PATH_SEPARATOR}$ENV{PATH}"
             # Python path (to find compiled module)
             "PYTHONPATH=$<TARGET_FILE_DIR:${TARGET_NAME}>${SYS_PATH_SEPARATOR}$ENV{PYTHONPATH}"
             # ASAN in case of sanitizers
@@ -75,7 +75,7 @@ if(DEPTHAI_PYTHON_TEST_EXAMPLES)
     add_test(NAME install_requirements COMMAND
         ${CMAKE_COMMAND} -E env
         # PATH (dlls)
-        "PATH=${HUNTER_INSTALL_PREFIX}${SYS_PATH_SEPARATOR}$ENV{PATH}"
+        "PATH=${HUNTER_INSTALL_PREFIX}/bin${SYS_PATH_SEPARATOR}$ENV{PATH}"
         # Python path (to find compiled module)
         "PYTHONPATH=$<TARGET_FILE_DIR:${TARGET_NAME}>${SYS_PATH_SEPARATOR}$ENV{PYTHONPATH}"
         # ASAN in case of sanitizers

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -22,7 +22,7 @@ add_custom_target(
     pytest COMMAND
         ${CMAKE_COMMAND} -E env
         # PATH (dlls)
-        "PATH=${HUNTER_INSTALL_PREFIX}${SYS_PATH_SEPARATOR}$ENV{PATH}"
+        "PATH=${HUNTER_INSTALL_PREFIX}/bin${SYS_PATH_SEPARATOR}$ENV{PATH}"
         # Python path (to find compiled modules)
         "PYTHONPATH=$<TARGET_FILE_DIR:${TARGET_NAME}>${SYS_PATH_SEPARATOR}$<TARGET_FILE_DIR:${TARGET_TEST_MODULE}>${SYS_PATH_SEPARATOR}$ENV{PYTHONPATH}"
         # ASAN in case of sanitizers