From 3fcad1e664ef3df70adca145f71ae3209a63f884 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 23 Jan 2025 16:53:40 +0100 Subject: [PATCH 1/4] install pigz --- .github/workflows/job_openvino_js.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/job_openvino_js.yml b/.github/workflows/job_openvino_js.yml index dbee8511c4187b..db26ddc212cc07 100644 --- a/.github/workflows/job_openvino_js.yml +++ b/.github/workflows/job_openvino_js.yml @@ -38,6 +38,10 @@ jobs: sparse-checkout: | src/bindings/js path: 'openvino' + + - name: Install OpenVINO dependencies (mac) + if: runner.os == 'macOS' + run: brew install pigz # Needed as ${{ github.workspace }} is not working correctly when using Docker - name: Setup Variables From b91c7b5bf49d2c176046de7b22c0e5fd87b4644c Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 23 Jan 2025 16:55:35 +0100 Subject: [PATCH 2/4] enable mac piplenes --- .github/workflows/mac.yml | 38 ++++++++++++++++----------------- .github/workflows/mac_arm64.yml | 38 ++++++++++++++++----------------- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 0fbc20cf19594b..4babc27e6e9fba 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -4,25 +4,25 @@ on: schedule: # at 00:00 on workdays - cron: '0 0 * * 1,2,3,4,5' - #pull_request: - # paths-ignore: - # - '**/docs/**' - # - 'docs/**' - # - '**/**.md' - # - '**.md' - # - '**/layer_tests_summary/**' - # - '**/conformance/**' - #push: - # paths-ignore: - # - '**/docs/**' - # - 'docs/**' - # - '**/**.md' - # - '**.md' - # - '**/layer_tests_summary/**' - # - '**/conformance/**' - # branches: - # - master - # - 'releases/**' + pull_request: + paths-ignore: + - '**/docs/**' + - 'docs/**' + - '**/**.md' + - '**.md' + - '**/layer_tests_summary/**' + - '**/conformance/**' + push: + paths-ignore: + - '**/docs/**' + - 'docs/**' + - '**/**.md' + - '**.md' + - '**/layer_tests_summary/**' + - '**/conformance/**' + branches: + - master + - 'releases/**' concurrency: # github.ref is not unique in post-commit diff --git a/.github/workflows/mac_arm64.yml b/.github/workflows/mac_arm64.yml index b60daefa442c83..098f3da6c4e6c2 100644 --- a/.github/workflows/mac_arm64.yml +++ b/.github/workflows/mac_arm64.yml @@ -4,25 +4,25 @@ on: schedule: # at 00:00 on workdays - cron: '0 0 * * 1,2,3,4,5' - #pull_request: - # paths-ignore: - # - '**/docs/**' - # - 'docs/**' - # - '**/**.md' - # - '**.md' - # - '**/layer_tests_summary/**' - # - '**/conformance/**' - #push: - # paths-ignore: - # - '**/docs/**' - # - 'docs/**' - # - '**/**.md' - # - '**.md' - # - '**/layer_tests_summary/**' - # - '**/conformance/**' - # branches: - # - master - # - 'releases/**' + pull_request: + paths-ignore: + - '**/docs/**' + - 'docs/**' + - '**/**.md' + - '**.md' + - '**/layer_tests_summary/**' + - '**/conformance/**' + push: + paths-ignore: + - '**/docs/**' + - 'docs/**' + - '**/**.md' + - '**.md' + - '**/layer_tests_summary/**' + - '**/conformance/**' + branches: + - master + - 'releases/**' concurrency: # github.ref is not unique in post-commit From 7a5729fd01c25241146e350877ec531c54a8f722 Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 23 Jan 2025 18:34:02 +0100 Subject: [PATCH 3/4] fixed pipelines --- .github/workflows/mac.yml | 11 +++++++---- .github/workflows/mac_arm64.yml | 10 +++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 4babc27e6e9fba..c8b865612eeb31 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -240,11 +240,14 @@ jobs: -DCPACK_GENERATOR=NPM \ -S ${{ env.OPENVINO_REPO }} \ -B ${{ env.BUILD_DIR }} - cmake --build ${{ env.BUILD_DIR }} --parallel $(nproc) - cmake -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR_JS }} -P ${{ env.BUILD_DIR }}/cmake_install.cmake + - name: Pack openvino_js_package + if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API + run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_js_package.tar.gz + working-directory: ${{ env.INSTALL_DIR_JS }} + # # Upload build artifacts # @@ -271,13 +274,13 @@ jobs: name: openvino_tests path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz if-no-files-found: 'error' - + - name: Upload openvino js package if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: openvino_js_package - path: ${{ env.INSTALL_DIR_JS }} + path: ${{ env.BUILD_DIR }}/openvino_js_package.tar.gz if-no-files-found: 'error' Samples: diff --git a/.github/workflows/mac_arm64.yml b/.github/workflows/mac_arm64.yml index 098f3da6c4e6c2..c36dbe644d943e 100644 --- a/.github/workflows/mac_arm64.yml +++ b/.github/workflows/mac_arm64.yml @@ -241,10 +241,14 @@ jobs: -DCPACK_GENERATOR=NPM \ -S ${{ env.OPENVINO_REPO }} \ -B ${{ env.BUILD_DIR }} - cmake --build ${{ env.BUILD_DIR }} --parallel $(nproc) - cmake -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR_JS }} -P ${{ env.BUILD_DIR }}/cmake_install.cmake + + - name: Pack openvino_js_package + if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API + run: tar -cvf - * | pigz > ${BUILD_DIR}/openvino_js_package.tar.gz + working-directory: ${{ env.INSTALL_DIR_JS }} + # # Upload build artifacts # @@ -277,7 +281,7 @@ jobs: uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3 with: name: openvino_js_package - path: ${{ env.INSTALL_DIR_JS }} + path: ${{ env.BUILD_DIR }}/openvino_js_package.tar.gz if-no-files-found: 'error' Samples: From c828bf08098e245c93f696f5e4d4a9d8ea5a6bdb Mon Sep 17 00:00:00 2001 From: Mikhail Ryzhov Date: Thu, 23 Jan 2025 21:42:22 +0100 Subject: [PATCH 4/4] Update .github/workflows/mac.yml --- .github/workflows/mac.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index c8b865612eeb31..33adb9c321ea86 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -274,7 +274,6 @@ jobs: name: openvino_tests path: ${{ env.BUILD_DIR }}/openvino_tests.tar.gz if-no-files-found: 'error' - - name: Upload openvino js package if: fromJSON(needs.smart_ci.outputs.affected_components).JS_API uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3