Skip to content

Commit cf3331c

Browse files
author
Matevz Morato
committed
Merge remote-tracking branch 'origin/develop' into hunter-enable
2 parents 5340a08 + 1437434 commit cf3331c

File tree

292 files changed

+603
-14169
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

292 files changed

+603
-14169
lines changed

.github/workflows/bom.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: BOM Testing
33
on:
44
push:
55
branches:
6-
- v3_develop
6+
- develop
77
tags:
88
- 'v*'
99
workflow_dispatch:
@@ -30,7 +30,7 @@ on:
3030
depthai:
3131
required: false
3232
type: string
33-
default: "v3_develop"
33+
default: "develop"
3434
description: "Version for depthai"
3535

3636
jobs:

.github/workflows/main.workflow.yml

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ on:
66
branches:
77
- main
88
- develop
9-
- v3_develop
109
tags:
11-
- 'v2*'
10+
- 'v*'
1211
pull_request:
1312
branches:
1413
- main
1514
- develop
16-
- v3_develop
1715

1816
jobs:
1917

@@ -61,7 +59,7 @@ jobs:
6159
strategy:
6260
matrix:
6361
os: [macos-latest, windows-latest, ubuntu-latest]
64-
cmake: ['3.29.x']
62+
cmake: ['3.22.x', '4.0.x']
6563

6664
steps:
6765
- uses: actions/checkout@v4
@@ -225,19 +223,19 @@ jobs:
225223
merge-multiple: true
226224
path: depthai-core-${{ steps.tag.outputs.version }}-win64
227225

228-
- name: Download Win32 artifacts
229-
uses: actions/download-artifact@v4
230-
with:
231-
pattern: windows-prebuilt-win32-no-opencv*
232-
merge-multiple: true
233-
path: depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv
226+
# - name: Download Win32 artifacts
227+
# uses: actions/download-artifact@v4
228+
# with:
229+
# pattern: windows-prebuilt-win32-no-opencv*
230+
# merge-multiple: true
231+
# path: depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv
234232

235233
- name: Create release assets
236234
run: |
237235
git-archive-all depthai-core-${{ steps.tag.outputs.version }}.tar.gz
238236
git-archive-all depthai-core-${{ steps.tag.outputs.version }}.zip
239237
zip -r depthai-core-${{ steps.tag.outputs.version }}-win64.zip depthai-core-${{ steps.tag.outputs.version }}-win64
240-
zip -r depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv
238+
# zip -r depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv
241239
242240
# Create GitHub release
243241
- uses: actions/create-release@master
@@ -288,12 +286,12 @@ jobs:
288286
asset_name: depthai-core-${{ steps.tag.outputs.version }}-win64.zip
289287
asset_content_type: application/octet-stream
290288

291-
- name: Upload Win32 package (zip)
292-
uses: actions/[email protected]
293-
env:
294-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
295-
with:
296-
upload_url: ${{ steps.createRelease.outputs.upload_url }}
297-
asset_path: ${{ github.workspace }}/depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip
298-
asset_name: depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip
299-
asset_content_type: application/octet-stream
289+
# - name: Upload Win32 package (zip)
290+
# uses: actions/[email protected]
291+
# env:
292+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
293+
# with:
294+
# upload_url: ${{ steps.createRelease.outputs.upload_url }}
295+
# asset_path: ${{ github.workspace }}/depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip
296+
# asset_name: depthai-core-${{ steps.tag.outputs.version }}-win32-no-opencv.zip
297+
# asset_content_type: application/octet-stream

.github/workflows/python-docker-hub.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
name: Publish Docker image
22
on:
33
workflow_dispatch:
4-
push:
5-
branches:
6-
- main
7-
- develop
8-
tags:
9-
- 'v2*'
4+
# TODO(Morato) - re-enable docker upload
5+
# push:
6+
# branches:
7+
# - main
8+
# - develop
9+
# tags:
10+
# - 'v2*'
1011
jobs:
1112

1213
build:

0 commit comments

Comments
 (0)