From c339fb5ac392837e1366c9f403b2cc8463f3dec8 Mon Sep 17 00:00:00 2001 From: moratom <47612463+moratom@users.noreply.github.com> Date: Fri, 8 Mar 2024 18:23:09 +0100 Subject: [PATCH 1/3] FIx macos build --- .github/workflows/main.workflow.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.workflow.yml b/.github/workflows/main.workflow.yml index 3b07b0018..1ad151216 100644 --- a/.github/workflows/main.workflow.yml +++ b/.github/workflows/main.workflow.yml @@ -180,6 +180,9 @@ jobs: echo "OpenCV_DIR=C:\tools\opencv\build" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "CMAKE_GENERATOR=Visual Studio 17 2022" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "CMAKE_GENERATOR_PLATFORM=${{ matrix.platform }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + - name: Setup cmake # TODO - without it, wheels don't build on latest macos-latest + uses: jwlawson/actions-setup-cmake@v1.13 - name: Configure ${{ matrix.build-type }}, shared ${{ matrix.shared }}, ${{ matrix.platform }} run: cmake -S . -B build -D BUILD_SHARED_LIBS=${{ matrix.shared}} -D CMAKE_BUILD_TYPE=${{ matrix.build-type }} -D CMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/depthai_install ${{ env.CMAKE_ARGS }} @@ -330,4 +333,4 @@ jobs: upload_url: ${{ steps.createRelease.outputs.upload_url }} asset_path: ${{ github.workspace }}/depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip asset_name: depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip - asset_content_type: application/octet-stream \ No newline at end of file + asset_content_type: application/octet-stream From 39010d83f2a0179fdbfaf08b95a15b2f201087a0 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Fri, 8 Mar 2024 19:04:43 +0100 Subject: [PATCH 2/3] Clean up comments --- .github/workflows/main.workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.workflow.yml b/.github/workflows/main.workflow.yml index 1ad151216..8e7aee851 100644 --- a/.github/workflows/main.workflow.yml +++ b/.github/workflows/main.workflow.yml @@ -180,8 +180,8 @@ jobs: echo "OpenCV_DIR=C:\tools\opencv\build" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "CMAKE_GENERATOR=Visual Studio 17 2022" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "CMAKE_GENERATOR_PLATFORM=${{ matrix.platform }}" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - - name: Setup cmake # TODO - without it, wheels don't build on latest macos-latest + + - name: Setup cmake uses: jwlawson/actions-setup-cmake@v1.13 - name: Configure ${{ matrix.build-type }}, shared ${{ matrix.shared }}, ${{ matrix.platform }} From eda133072c2d9b2dadc89221d44c6bd3c1599731 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Fri, 8 Mar 2024 19:09:11 +0100 Subject: [PATCH 3/3] Remove irrelevant change --- .github/workflows/main.workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.workflow.yml b/.github/workflows/main.workflow.yml index 8e7aee851..eec36eba8 100644 --- a/.github/workflows/main.workflow.yml +++ b/.github/workflows/main.workflow.yml @@ -333,4 +333,4 @@ jobs: upload_url: ${{ steps.createRelease.outputs.upload_url }} asset_path: ${{ github.workspace }}/depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip asset_name: depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip - asset_content_type: application/octet-stream + asset_content_type: application/octet-stream \ No newline at end of file