File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -22,15 +22,20 @@ jobs:
2222 image : ghcr.io/viam-modules/viam-camera-realsense:amd64
2323 options : --platform linux/amd64
2424 - os : macos-latest
25- container :
26- image : ghcr.io/viam-modules/viam-camera-realsense:macos
27- options : --platform macos/arm64
25+ container : null
2826
27+ runs-on : ${{ matrix.os }}
2928 container : ${{ matrix.container }}
3029
3130 steps :
3231 - name : Checkout code
3332 uses : actions/checkout@v3
3433
34+ - name : Install dependencies (macOS)
35+ if : matrix.os == 'macos-latest'
36+ run : |
37+ make setup
38+ ./bin/build_librealsense_macos.sh
39+
3540 - name : Run the tests
3641 run : make test-native
Original file line number Diff line number Diff line change @@ -53,10 +53,16 @@ test: conan-install-test conan-build-test
5353 cd build-conan/build/RelWithDebInfo && . ./generators/conanrun.sh && ctest --output-on-failure
5454
5555# Native build targets for CI environments with pre-installed dependencies
56+ ifeq ($(UNAME_S ) ,Darwin)
57+ NPROC := $(shell sysctl -n hw.ncpu)
58+ else
59+ NPROC := $(shell nproc)
60+ endif
61+
5662build-native :
5763 mkdir -p build-native && cd build-native && \
5864 cmake .. -DVIAM_REALSENSE_ENABLE_TESTS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo && \
59- make -j$(shell nproc )
65+ make -j$(NPROC )
6066
6167test-native : build-native
6268 cd build-native && ctest --output-on-failure
You can’t perform that action at this time.
0 commit comments