From a13036d15edc89723bf78ddfd78f05326cd305ec Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 10:35:13 +0300 Subject: [PATCH 01/13] Test JS threads --- .github/workflows/OCV-Nightly-docs-js.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index 7934484e..563ed062 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -44,7 +44,7 @@ jobs: - name: Clone opencv_contrib timeout-minutes: 60 run: git clone --single-branch --branch ${{ matrix.branch }} https://github.com/opencv/opencv_contrib.git $HOME/opencv_contrib - - name: Build js + - name: Build js (default) timeout-minutes: 60 run: | cd $HOME/build @@ -56,6 +56,18 @@ jobs: cd $HOME/build/js/bin npm install node tests.js + - name: Build js (threads) + timeout-minutes: 60 + run: | + cd $HOME/build + emcmake python ../opencv/platforms/js/build_js.py js_threads --build_test --threads + - name: Run js tests (threads) + timeout-minutes: 60 + if: ${{ always() && matrix.branch == '4.x' }} + run: | + cd $HOME/build/js_threads/bin + npm install + node tests.js - name: Configure OpenCV doxygen timeout-minutes: 60 run: | From a1b10f557f5e8921225772a02190adae0bc6377f Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 11:37:10 +0300 Subject: [PATCH 02/13] Update OCV-Nightly-docs-js.yaml --- .github/workflows/OCV-Nightly-docs-js.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index 563ed062..51821063 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -60,7 +60,7 @@ jobs: timeout-minutes: 60 run: | cd $HOME/build - emcmake python ../opencv/platforms/js/build_js.py js_threads --build_test --threads + emcmake python ../opencv/platforms/js/build_js.py js_threads --build_wasm --build_test --threads - name: Run js tests (threads) timeout-minutes: 60 if: ${{ always() && matrix.branch == '4.x' }} From e6d2f57b401c1aa73ba140af0a14d4aa03974889 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 12:07:04 +0300 Subject: [PATCH 03/13] run_puppeteer --- .github/workflows/OCV-Nightly-docs-js.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index 51821063..65faef4b 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -67,7 +67,8 @@ jobs: run: | cd $HOME/build/js_threads/bin npm install - node tests.js + npm install --no-save puppeteer + node run_puppeteer.js - name: Configure OpenCV doxygen timeout-minutes: 60 run: | From bbf5a46f3e3a9c2558a11a1df5418c447d99d31d Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 13:05:01 +0300 Subject: [PATCH 04/13] Node.js 18 --- .github/workflows/OCV-Nightly-docs-js.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index 65faef4b..ee14e232 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -44,6 +44,11 @@ jobs: - name: Clone opencv_contrib timeout-minutes: 60 run: git clone --single-branch --branch ${{ matrix.branch }} https://github.com/opencv/opencv_contrib.git $HOME/opencv_contrib + - name: Update Node.js + run: | + apt-get update + apt-get autoremove -y nodejs + curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -y nodejs - name: Build js (default) timeout-minutes: 60 run: | From 5bb2561e24cf1091eba0a07964af0154d540e34d Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 13:08:20 +0300 Subject: [PATCH 05/13] sudo --- .github/workflows/OCV-Nightly-docs-js.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index ee14e232..c7dcf53c 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -46,9 +46,9 @@ jobs: run: git clone --single-branch --branch ${{ matrix.branch }} https://github.com/opencv/opencv_contrib.git $HOME/opencv_contrib - name: Update Node.js run: | - apt-get update - apt-get autoremove -y nodejs - curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -y nodejs + sudo apt-get update + sudo apt-get autoremove -y nodejs + curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && sudo apt-get install -y nodejs - name: Build js (default) timeout-minutes: 60 run: | From a6a9c2e2a59c2df6f725314e75f62b3bf7dbc862 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 13:12:36 +0300 Subject: [PATCH 06/13] puppeteer@13.7.0 --- .github/workflows/OCV-Nightly-docs-js.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index c7dcf53c..08cea3dd 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -44,11 +44,6 @@ jobs: - name: Clone opencv_contrib timeout-minutes: 60 run: git clone --single-branch --branch ${{ matrix.branch }} https://github.com/opencv/opencv_contrib.git $HOME/opencv_contrib - - name: Update Node.js - run: | - sudo apt-get update - sudo apt-get autoremove -y nodejs - curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && sudo apt-get install -y nodejs - name: Build js (default) timeout-minutes: 60 run: | @@ -72,7 +67,7 @@ jobs: run: | cd $HOME/build/js_threads/bin npm install - npm install --no-save puppeteer + npm install --no-save puppeteer@13.7.0 node run_puppeteer.js - name: Configure OpenCV doxygen timeout-minutes: 60 From a6dbd4c87ab8f5f8110c627f06abbaadc2c1ef1a Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 15:45:11 +0300 Subject: [PATCH 07/13] Install libnss3 --- .github/workflows/OCV-Nightly-docs-js.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index 08cea3dd..cd2188f0 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -61,6 +61,8 @@ jobs: run: | cd $HOME/build emcmake python ../opencv/platforms/js/build_js.py js_threads --build_wasm --build_test --threads + wget http://launchpadlibrarian.net/724214463/libnss3_3.98-0ubuntu0.20.04.2_amd64.deb + dpkg -x libnss3_3.98-0ubuntu0.20.04.2_amd64.deb $HOME/libnss - name: Run js tests (threads) timeout-minutes: 60 if: ${{ always() && matrix.branch == '4.x' }} @@ -68,7 +70,9 @@ jobs: cd $HOME/build/js_threads/bin npm install npm install --no-save puppeteer@13.7.0 - node run_puppeteer.js + node run_puppeteer.js + env: + LD_LIBRARY_PATH: $HOME/libnss/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH - name: Configure OpenCV doxygen timeout-minutes: 60 run: | From 4c7f9da4679e853e6f08911e1c47e92f5d1c2dc6 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 26 Jul 2024 16:22:51 +0300 Subject: [PATCH 08/13] Update OCV-Nightly-docs-js.yaml --- .github/workflows/OCV-Nightly-docs-js.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index cd2188f0..becda5f3 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -72,7 +72,7 @@ jobs: npm install --no-save puppeteer@13.7.0 node run_puppeteer.js env: - LD_LIBRARY_PATH: $HOME/libnss/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH + LD_LIBRARY_PATH: $HOME/libnss/usr/lib/x86_64-linux-gnu/ - name: Configure OpenCV doxygen timeout-minutes: 60 run: | From a720cf5ccc99bfae7443804f845d7296a571ca69 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Mon, 29 Jul 2024 12:08:53 +0300 Subject: [PATCH 09/13] Update OCV-Nightly-docs-js.yaml --- .github/workflows/OCV-Nightly-docs-js.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index becda5f3..aab55c08 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -67,12 +67,11 @@ jobs: timeout-minutes: 60 if: ${{ always() && matrix.branch == '4.x' }} run: | + export LD_LIBRARY_PATH=$HOME/libnss/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH cd $HOME/build/js_threads/bin npm install npm install --no-save puppeteer@13.7.0 node run_puppeteer.js - env: - LD_LIBRARY_PATH: $HOME/libnss/usr/lib/x86_64-linux-gnu/ - name: Configure OpenCV doxygen timeout-minutes: 60 run: | From fd6bc10cad9723a9618b2940608157b0b36ff0c3 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Mon, 29 Jul 2024 12:38:32 +0300 Subject: [PATCH 10/13] libnspr4 --- .github/workflows/OCV-Nightly-docs-js.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index aab55c08..ada58e27 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -61,13 +61,16 @@ jobs: run: | cd $HOME/build emcmake python ../opencv/platforms/js/build_js.py js_threads --build_wasm --build_test --threads - wget http://launchpadlibrarian.net/724214463/libnss3_3.98-0ubuntu0.20.04.2_amd64.deb - dpkg -x libnss3_3.98-0ubuntu0.20.04.2_amd64.deb $HOME/libnss - name: Run js tests (threads) timeout-minutes: 60 if: ${{ always() && matrix.branch == '4.x' }} run: | - export LD_LIBRARY_PATH=$HOME/libnss/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH + wget http://launchpadlibrarian.net/724214463/libnss3_3.98-0ubuntu0.20.04.2_amd64.deb + wget http://launchpadlibrarian.net/720519830/libnspr4_4.35-0ubuntu0.20.04.1_amd64.deb + dpkg -x libnss3_3.98-0ubuntu0.20.04.2_amd64.deb $HOME/libs + dpkg -x libnspr4_4.35-0ubuntu0.20.04.1_amd64.deb $HOME/libs + + export LD_LIBRARY_PATH=$HOME/libs/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH cd $HOME/build/js_threads/bin npm install npm install --no-save puppeteer@13.7.0 From b0d3db3e58bdca4f695a1f18dd8bd3c9adbf9f92 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Mon, 29 Jul 2024 15:50:10 +0300 Subject: [PATCH 11/13] libatk --- .github/workflows/OCV-Nightly-docs-js.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index ada58e27..1fa213bf 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -67,8 +67,10 @@ jobs: run: | wget http://launchpadlibrarian.net/724214463/libnss3_3.98-0ubuntu0.20.04.2_amd64.deb wget http://launchpadlibrarian.net/720519830/libnspr4_4.35-0ubuntu0.20.04.1_amd64.deb + wget http://launchpadlibrarian.net/475048901/libatk1.0-0_2.35.1-1ubuntu2_amd64.deb dpkg -x libnss3_3.98-0ubuntu0.20.04.2_amd64.deb $HOME/libs dpkg -x libnspr4_4.35-0ubuntu0.20.04.1_amd64.deb $HOME/libs + dpkg -x libatk1.0-0_2.35.1-1ubuntu2_amd64.deb $HOME/libs export LD_LIBRARY_PATH=$HOME/libs/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH cd $HOME/build/js_threads/bin From 2c5a38dd20a9d30083099d97f6bb6536fe52bbca Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Thu, 1 Aug 2024 16:43:07 +0300 Subject: [PATCH 12/13] run as root --- .github/workflows/OCV-Nightly-docs-js.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index 1fa213bf..94f1100f 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -30,7 +30,7 @@ jobs: branch: ['3.4', '4.x', '5.x'] container: image: quay.io/opencv-ci/opencv-docs-js-20.04:20220728 - options: --user ci + options: --user root steps: - name: Define proper HOME path timeout-minutes: 60 @@ -65,14 +65,9 @@ jobs: timeout-minutes: 60 if: ${{ always() && matrix.branch == '4.x' }} run: | - wget http://launchpadlibrarian.net/724214463/libnss3_3.98-0ubuntu0.20.04.2_amd64.deb - wget http://launchpadlibrarian.net/720519830/libnspr4_4.35-0ubuntu0.20.04.1_amd64.deb - wget http://launchpadlibrarian.net/475048901/libatk1.0-0_2.35.1-1ubuntu2_amd64.deb - dpkg -x libnss3_3.98-0ubuntu0.20.04.2_amd64.deb $HOME/libs - dpkg -x libnspr4_4.35-0ubuntu0.20.04.1_amd64.deb $HOME/libs - dpkg -x libatk1.0-0_2.35.1-1ubuntu2_amd64.deb $HOME/libs - - export LD_LIBRARY_PATH=$HOME/libs/usr/lib/x86_64-linux-gnu/:$LD_LIBRARY_PATH + apt-get update + apt-get install -y libx11-xcb1 libxcomposite1 libasound2 libatk1.0-0 libatk-bridge2.0-0 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 + cd $HOME/build/js_threads/bin npm install npm install --no-save puppeteer@13.7.0 From 0df7467f7d9542358ac79d1c31804d4fd22068b3 Mon Sep 17 00:00:00 2001 From: Dmitry Kurtaev Date: Fri, 2 Aug 2024 09:40:24 +0300 Subject: [PATCH 13/13] Update OCV-Nightly-docs-js.yaml --- .github/workflows/OCV-Nightly-docs-js.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/OCV-Nightly-docs-js.yaml b/.github/workflows/OCV-Nightly-docs-js.yaml index 94f1100f..ed428153 100644 --- a/.github/workflows/OCV-Nightly-docs-js.yaml +++ b/.github/workflows/OCV-Nightly-docs-js.yaml @@ -69,6 +69,7 @@ jobs: apt-get install -y libx11-xcb1 libxcomposite1 libasound2 libatk1.0-0 libatk-bridge2.0-0 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgbm1 libgcc1 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 cd $HOME/build/js_threads/bin + chmod 777 -R . npm install npm install --no-save puppeteer@13.7.0 node run_puppeteer.js