From 7f6ddc9e87c1d6193a56ee5be4248d674187bf09 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Thu, 23 Jan 2025 15:22:21 +0100 Subject: [PATCH 1/6] Bump RVC4 FW --- cmake/Depthai/DepthaiDeviceRVC4Config.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiDeviceRVC4Config.cmake b/cmake/Depthai/DepthaiDeviceRVC4Config.cmake index bc21ef107..67e93edd1 100644 --- a/cmake/Depthai/DepthaiDeviceRVC4Config.cmake +++ b/cmake/Depthai/DepthaiDeviceRVC4Config.cmake @@ -4,4 +4,4 @@ set(DEPTHAI_DEVICE_RVC4_MATURITY "snapshot") # "version if applicable" # set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+93f7b75a885aa32f44c5e9f53b74470c49d2b1af") -set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+09829e4939aeb5118b7d77fb6733ae614a5c485a") +set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+a107eb2a79ea3bf43bc0e35d9ddb52f1c2efd717") From fac7d02266bea3a2065714d8cdc2494a20be2755 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Thu, 23 Jan 2025 15:28:59 +0100 Subject: [PATCH 2/6] Bump the upload artifact action to v4 --- .github/workflows/python-main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-main.yml b/.github/workflows/python-main.yml index 5ae86935e..4f331af06 100644 --- a/.github/workflows/python-main.yml +++ b/.github/workflows/python-main.yml @@ -59,7 +59,7 @@ jobs: - name: Build target 'pybind11_mkdoc' run: cmake --build build --target pybind11_mkdoc --parallel 4 - name: Upload docstring artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: docstrings path: bindings/python/docstrings/ @@ -248,7 +248,7 @@ jobs: - name: Building wheels run: cd bindings/python && python -m pip wheel . -w ./wheelhouse/audited/ --verbose - name: Archive wheel artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: audited-wheels path: bindings/python/wheelhouse/audited/ @@ -320,7 +320,7 @@ jobs: - name: Auditing wheels run: cd bindings/python && ci/repair-whl-macos.sh `pwd`/wheelhouse/* `pwd`/wheelhouse/audited - name: Archive wheel artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: audited-wheels path: bindings/python/wheelhouse/audited/ @@ -459,7 +459,7 @@ jobs: - name: Audit wheels run: cd bindings/python && for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done - name: Archive wheel artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: audited-wheels path: bindings/python/wheelhouse/audited/ @@ -537,7 +537,7 @@ jobs: - name: Auditing wheels run: cd bindings/python && for whl in wheelhouse/*.whl; do auditwheel repair "$whl" --plat $PLAT -w wheelhouse/audited/; done - name: Archive wheel artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: audited-wheels path: bindings/python/wheelhouse/audited/ From e9e9f2db15ad7e7f950e13c6fe51be22e72223d7 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Thu, 23 Jan 2025 16:36:15 +0100 Subject: [PATCH 3/6] Bump download-artifact to v4 --- .github/workflows/python-main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/python-main.yml b/.github/workflows/python-main.yml index 4f331af06..2329223df 100644 --- a/.github/workflows/python-main.yml +++ b/.github/workflows/python-main.yml @@ -103,7 +103,7 @@ jobs: with: submodules: 'recursive' - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: 'docstrings' path: bindings/python/docstrings @@ -159,7 +159,7 @@ jobs: # with: # submodules: 'recursive' - # - uses: actions/download-artifact@v3 + # - uses: actions/download-artifact@v4 # with: # name: 'docstrings' # path: bindings/python/docstrings @@ -224,7 +224,7 @@ jobs: core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: 'docstrings' path: bindings/python/docstrings @@ -295,7 +295,7 @@ jobs: with: submodules: 'recursive' - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: 'docstrings' path: bindings/python/docstrings @@ -356,7 +356,7 @@ jobs: # run: | # brew install opencv - # - uses: actions/download-artifact@v3 + # - uses: actions/download-artifact@v4 # with: # name: 'docstrings' # path: bindings/python/docstrings @@ -436,7 +436,7 @@ jobs: - name: Create folder structure run: cd bindings/python && mkdir -p wheelhouse/audited/ - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: 'docstrings' path: bindings/python/docstrings @@ -521,7 +521,7 @@ jobs: - name: Create folder structure run: cd bindings/python && mkdir -p wheelhouse/audited/ - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: 'docstrings' path: bindings/python/docstrings @@ -577,7 +577,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: 'recursive' - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: audited-wheels path: bindings/python/wheelhouse/audited/ From 8277a92ce6377f12566c4d22cdb640cd6a47ebd2 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Fri, 24 Jan 2025 13:29:04 +0100 Subject: [PATCH 4/6] Avoid uploading the whole audited dir --- .github/workflows/python-main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-main.yml b/.github/workflows/python-main.yml index 2329223df..2a2bcbc04 100644 --- a/.github/workflows/python-main.yml +++ b/.github/workflows/python-main.yml @@ -251,7 +251,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: audited-wheels - path: bindings/python/wheelhouse/audited/ + path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true run: cd bindings/python && bash ./ci/upload-artifactory.sh @@ -323,7 +323,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: audited-wheels - path: bindings/python/wheelhouse/audited/ + path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true run: cd bindings/python && bash ./ci/upload-artifactory.sh @@ -462,7 +462,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: audited-wheels - path: bindings/python/wheelhouse/audited/ + path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true run: cd bindings/python && bash ./ci/upload-artifactory.sh @@ -540,7 +540,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: audited-wheels - path: bindings/python/wheelhouse/audited/ + path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true run: cd bindings/python && bash ./ci/upload-artifactory.sh From a6a3fd1e054df59a3d075978cb2a6677ee0eee6a Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Fri, 24 Jan 2025 15:50:39 +0100 Subject: [PATCH 5/6] Update download and upload action --- .github/workflows/python-main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-main.yml b/.github/workflows/python-main.yml index 2a2bcbc04..09ea8ce7f 100644 --- a/.github/workflows/python-main.yml +++ b/.github/workflows/python-main.yml @@ -250,7 +250,7 @@ jobs: - name: Archive wheel artifacts uses: actions/upload-artifact@v4 with: - name: audited-wheels + name: audited-wheels-windows-${{ matrix.python-version }} path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true @@ -322,7 +322,7 @@ jobs: - name: Archive wheel artifacts uses: actions/upload-artifact@v4 with: - name: audited-wheels + name: audited-wheels-macos-${{ matrix.python-version }} path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true @@ -461,7 +461,7 @@ jobs: - name: Archive wheel artifacts uses: actions/upload-artifact@v4 with: - name: audited-wheels + name: audited-wheels-linux-x86_64-${{ matrix.python-set }} path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true @@ -539,7 +539,7 @@ jobs: - name: Archive wheel artifacts uses: actions/upload-artifact@v4 with: - name: audited-wheels + name: audited-wheels-linux-arm64-${{ matrix.python-set }} path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true @@ -579,7 +579,8 @@ jobs: submodules: 'recursive' - uses: actions/download-artifact@v4 with: - name: audited-wheels + pattern: audited-wheels* + merge-multiple: true path: bindings/python/wheelhouse/audited/ - name: List files run: ls -lah From 4bcad1968f376cd35e00436430e6502c1ab38ca7 Mon Sep 17 00:00:00 2001 From: Matevz Morato Date: Fri, 24 Jan 2025 17:28:48 +0100 Subject: [PATCH 6/6] Further specify the Mac name --- .github/workflows/python-main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-main.yml b/.github/workflows/python-main.yml index 09ea8ce7f..f057ee33e 100644 --- a/.github/workflows/python-main.yml +++ b/.github/workflows/python-main.yml @@ -322,7 +322,7 @@ jobs: - name: Archive wheel artifacts uses: actions/upload-artifact@v4 with: - name: audited-wheels-macos-${{ matrix.python-version }} + name: audited-wheels-macos-${{ matrix.os }}-${{ matrix.python-version }} path: bindings/python/wheelhouse/audited/* - name: Deploy wheels to artifactory (if not a release) if: startsWith(github.ref, 'refs/tags/v') != true