From 7263acc8e66be47da247fb81df9c7f887f692488 Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 10:37:39 +0900 Subject: [PATCH 01/12] Update windows.yml --- .github/workflows/windows.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 243a0f9e5..35f370be8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -60,6 +60,13 @@ jobs: path: ${{ github.workspace }}/tesseract_files key: tesseract-41-rev1 + - name: Download Tesseract binaries by gh + if: steps.cache_tesseract.outputs.cache-hit != 'true' + shell: powershell + run: | + gh release download --repo shimat/tesseract_vcpkg 0.0.8-beta --pattern "*.zip" --dir tesseract_vcpkg + ls tesseract_vcpkg + - name: Download Tesseract binaries if: steps.cache_tesseract.outputs.cache-hit != 'true' shell: powershell From ceafbdb3eac1344169aba85531949977131de5ec Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 10:45:10 +0900 Subject: [PATCH 02/12] Update windows.yml --- .github/workflows/windows.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 35f370be8..a2a8beed1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,6 +47,13 @@ jobs: path: ${{ github.workspace }}/opencv_files key: opencv-${{ env.OPENCV_VERSION }}-rev2 + - name: Download OpenCV binaries by gh + if: steps.cache_opencv.outputs.cache-hit != 'true' + shell: powershell + run: | + gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" --dir opencv4100_win_x64 + ls opencv4100_win_x64 + - name: Download OpenCV binaries if: steps.cache_opencv.outputs.cache-hit != 'true' shell: powershell From b8c769a8651a00052e7eea5cf4d06767c119c9e9 Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 10:52:21 +0900 Subject: [PATCH 03/12] Update windows.yml --- .github/workflows/windows.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a2a8beed1..5cca98ed8 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -50,6 +50,8 @@ jobs: - name: Download OpenCV binaries by gh if: steps.cache_opencv.outputs.cache-hit != 'true' shell: powershell + env: + GH_TOKEN: ${{ github.token }} run: | gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" --dir opencv4100_win_x64 ls opencv4100_win_x64 @@ -70,6 +72,8 @@ jobs: - name: Download Tesseract binaries by gh if: steps.cache_tesseract.outputs.cache-hit != 'true' shell: powershell + env: + GH_TOKEN: ${{ github.token }} run: | gh release download --repo shimat/tesseract_vcpkg 0.0.8-beta --pattern "*.zip" --dir tesseract_vcpkg ls tesseract_vcpkg From ffea90f0a8655df5d5956df118d46d3b3164216d Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 11:04:14 +0900 Subject: [PATCH 04/12] Update windows.yml --- .github/workflows/windows.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5cca98ed8..e7786f436 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,16 +30,6 @@ jobs: # restore-keys: | # ${{ runner.os }}-nuget- - - name: NuGet restore - shell: cmd - run: | - nuget restore - - - name: Install Server-Media-Foundation - shell: powershell - run: | - Install-WindowsFeature Server-Media-Foundation - - name: Cache OpenCV binaries id: cache_opencv uses: actions/cache@v4 @@ -53,8 +43,10 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" --dir opencv4100_win_x64 - ls opencv4100_win_x64 + gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" --output opencv.zip + ls + Expand-Archive -Path opencv.zip -DestinationPath opencv -Force -ErrorAction Stop + ls opencv - name: Download OpenCV binaries if: steps.cache_opencv.outputs.cache-hit != 'true' @@ -75,8 +67,10 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - gh release download --repo shimat/tesseract_vcpkg 0.0.8-beta --pattern "*.zip" --dir tesseract_vcpkg - ls tesseract_vcpkg + gh release download --repo shimat/tesseract_vcpkg 2023.07.06 --pattern "*.zip" --output tesseract.zip + ls + Expand-Archive -Path tesseract.zip -DestinationPath tesseract -Force -ErrorAction Stop + ls tesseract - name: Download Tesseract binaries if: steps.cache_tesseract.outputs.cache-hit != 'true' @@ -84,6 +78,16 @@ jobs: run: | . ".\download_tesseract_windows.ps1" + - name: NuGet restore + shell: cmd + run: | + nuget restore + + - name: Install Server-Media-Foundation + shell: powershell + run: | + Install-WindowsFeature Server-Media-Foundation + - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 From 1ebbc448f5d7237a7d80fc065028d1c7dfccc4e0 Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 14:36:49 +0900 Subject: [PATCH 05/12] Update windows.yml --- .github/workflows/windows.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e7786f436..e754bf27a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -44,15 +44,14 @@ jobs: GH_TOKEN: ${{ github.token }} run: | gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" --output opencv.zip - ls - Expand-Archive -Path opencv.zip -DestinationPath opencv -Force -ErrorAction Stop - ls opencv + Expand-Archive -Path opencv.zip -DestinationPath opencv_files -Force -ErrorAction Stop + ls opencv_files - - name: Download OpenCV binaries - if: steps.cache_opencv.outputs.cache-hit != 'true' - shell: powershell - run: | - . ".\download_opencv_windows.ps1" + #- name: Download OpenCV binaries + # if: steps.cache_opencv.outputs.cache-hit != 'true' + # shell: powershell + # run: | + # . ".\download_opencv_windows.ps1" - name: Cache Tesseract binaries id: cache_tesseract @@ -68,15 +67,16 @@ jobs: GH_TOKEN: ${{ github.token }} run: | gh release download --repo shimat/tesseract_vcpkg 2023.07.06 --pattern "*.zip" --output tesseract.zip - ls - Expand-Archive -Path tesseract.zip -DestinationPath tesseract -Force -ErrorAction Stop - ls tesseract + Expand-Archive -Path tesseract.zip -DestinationPath tesseract_files -Force -ErrorAction Stop + New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force + Move-Item tesseract_files\*\* tesseract_files/tesseract_vcpkg + ls tesseract_files/tesseract_vcpkg - - name: Download Tesseract binaries - if: steps.cache_tesseract.outputs.cache-hit != 'true' - shell: powershell - run: | - . ".\download_tesseract_windows.ps1" + #- name: Download Tesseract binaries + # if: steps.cache_tesseract.outputs.cache-hit != 'true' + # shell: powershell + # run: | + # . ".\download_tesseract_windows.ps1" - name: NuGet restore shell: cmd From a91010b144f50981d7bf397b5e1ee368b9a1af68 Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 14:42:55 +0900 Subject: [PATCH 06/12] Update windows.yml --- .github/workflows/windows.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e754bf27a..3ba834293 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -43,8 +43,12 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" --output opencv.zip - Expand-Archive -Path opencv.zip -DestinationPath opencv_files -Force -ErrorAction Stop + gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" + gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x86.zip" + ls + New-Item opencv_files -ItemType Directory -Force + Expand-Archive -Path opencv4100_win_x64.zip -DestinationPath opencv_files/ -Force -ErrorAction Stop + Expand-Archive -Path opencv4100_win_x86.zip -DestinationPath opencv_files/ -Force -ErrorAction Stop ls opencv_files #- name: Download OpenCV binaries From 77c128ac6bdbf1d3fe8ea503fd8ad0135dfcd18b Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 14:45:03 +0900 Subject: [PATCH 07/12] Update windows.yml --- .github/workflows/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3ba834293..bcce92b09 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -46,9 +46,8 @@ jobs: gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x86.zip" ls - New-Item opencv_files -ItemType Directory -Force - Expand-Archive -Path opencv4100_win_x64.zip -DestinationPath opencv_files/ -Force -ErrorAction Stop - Expand-Archive -Path opencv4100_win_x86.zip -DestinationPath opencv_files/ -Force -ErrorAction Stop + Expand-Archive -Path opencv4100_win_x64.zip -DestinationPath opencv_files/opencv4100_win_x64 -Force -ErrorAction Stop + Expand-Archive -Path opencv4100_win_x86.zip -DestinationPath opencv_files/opencv4100_win_x86 -Force -ErrorAction Stop ls opencv_files #- name: Download OpenCV binaries From e92e492041443925af9b59d8959869b5d6266230 Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 15:48:03 +0900 Subject: [PATCH 08/12] Update windows.yml --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index bcce92b09..2b3c703a7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -72,7 +72,7 @@ jobs: gh release download --repo shimat/tesseract_vcpkg 2023.07.06 --pattern "*.zip" --output tesseract.zip Expand-Archive -Path tesseract.zip -DestinationPath tesseract_files -Force -ErrorAction Stop New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force - Move-Item tesseract_files\*\* tesseract_files/tesseract_vcpkg + Move-Item tesseract_files/tesseract_vcpkg/*/* tesseract_files/tesseract_vcpkg ls tesseract_files/tesseract_vcpkg #- name: Download Tesseract binaries From fccc3d4871da3449be0ddd00d49210c46b1d746b Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 17:16:37 +0900 Subject: [PATCH 09/12] Update windows.yml --- .github/workflows/windows.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2b3c703a7..902c90a9c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -44,11 +44,11 @@ jobs: GH_TOKEN: ${{ github.token }} run: | gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" - gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x86.zip" - ls + gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x86.zip" Expand-Archive -Path opencv4100_win_x64.zip -DestinationPath opencv_files/opencv4100_win_x64 -Force -ErrorAction Stop Expand-Archive -Path opencv4100_win_x86.zip -DestinationPath opencv_files/opencv4100_win_x86 -Force -ErrorAction Stop ls opencv_files + ls opencv_files/opencv4100_win_x64 #- name: Download OpenCV binaries # if: steps.cache_opencv.outputs.cache-hit != 'true' @@ -71,8 +71,9 @@ jobs: run: | gh release download --repo shimat/tesseract_vcpkg 2023.07.06 --pattern "*.zip" --output tesseract.zip Expand-Archive -Path tesseract.zip -DestinationPath tesseract_files -Force -ErrorAction Stop + ls tesseract_files New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force - Move-Item tesseract_files/tesseract_vcpkg/*/* tesseract_files/tesseract_vcpkg + Move-Item tesseract_files\*\* tesseract_files/tesseract_vcpkg ls tesseract_files/tesseract_vcpkg #- name: Download Tesseract binaries From bd391f9eaab7994943b37bff54c59446aa9f051f Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 17:27:41 +0900 Subject: [PATCH 10/12] Update windows.yml --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 902c90a9c..fdb8f4e2c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -73,7 +73,8 @@ jobs: Expand-Archive -Path tesseract.zip -DestinationPath tesseract_files -Force -ErrorAction Stop ls tesseract_files New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force - Move-Item tesseract_files\*\* tesseract_files/tesseract_vcpkg + Move-Item tesseract_files/*/* tesseract_files/tesseract_vcpkg + Move-Item tesseract_files/tesseract_vcpkg/installed/* tesseract_files/tesseract_vcpkg/ ls tesseract_files/tesseract_vcpkg #- name: Download Tesseract binaries From ff68d1a1b6abdbac3640b9b58ccb4f9331b4a675 Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 19:06:42 +0900 Subject: [PATCH 11/12] Update windows.yml --- .github/workflows/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fdb8f4e2c..0b79c3d76 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -73,7 +73,6 @@ jobs: Expand-Archive -Path tesseract.zip -DestinationPath tesseract_files -Force -ErrorAction Stop ls tesseract_files New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force - Move-Item tesseract_files/*/* tesseract_files/tesseract_vcpkg Move-Item tesseract_files/tesseract_vcpkg/installed/* tesseract_files/tesseract_vcpkg/ ls tesseract_files/tesseract_vcpkg From e010349d003dc093fbc90c08cf9307a52d47001d Mon Sep 17 00:00:00 2001 From: shimat Date: Sun, 18 Aug 2024 22:47:23 +0900 Subject: [PATCH 12/12] Update windows.yml --- .github/workflows/windows.yml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0b79c3d76..cdc0ffd61 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,24 +37,20 @@ jobs: path: ${{ github.workspace }}/opencv_files key: opencv-${{ env.OPENCV_VERSION }}-rev2 - - name: Download OpenCV binaries by gh + - name: Download OpenCV binaries if: steps.cache_opencv.outputs.cache-hit != 'true' shell: powershell env: GH_TOKEN: ${{ github.token }} run: | - gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip" - gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x86.zip" - Expand-Archive -Path opencv4100_win_x64.zip -DestinationPath opencv_files/opencv4100_win_x64 -Force -ErrorAction Stop - Expand-Archive -Path opencv4100_win_x86.zip -DestinationPath opencv_files/opencv4100_win_x86 -Force -ErrorAction Stop + $OPENCV_FILES_TAG = "4.10.0.20240612" + $OPENCV_VERSION = "4100" + gh release download --repo shimat/opencv_files $OPENCV_FILES_TAG --pattern "opencv${OPENCV_VERSION}_win_x64.zip" + gh release download --repo shimat/opencv_files $OPENCV_FILES_TAG --pattern "opencv${OPENCV_VERSION}_win_x86.zip" + Expand-Archive -Path opencv${OPENCV_VERSION}_win_x64.zip -DestinationPath opencv_files/opencv4100_win_x64 -Force -ErrorAction Stop + Expand-Archive -Path opencv${OPENCV_VERSION}_win_x86.zip -DestinationPath opencv_files/opencv4100_win_x86 -Force -ErrorAction Stop ls opencv_files - ls opencv_files/opencv4100_win_x64 - - #- name: Download OpenCV binaries - # if: steps.cache_opencv.outputs.cache-hit != 'true' - # shell: powershell - # run: | - # . ".\download_opencv_windows.ps1" + ls opencv_files/opencv${OPENCV_VERSION}_win_x64 - name: Cache Tesseract binaries id: cache_tesseract @@ -63,7 +59,7 @@ jobs: path: ${{ github.workspace }}/tesseract_files key: tesseract-41-rev1 - - name: Download Tesseract binaries by gh + - name: Download Tesseract binaries if: steps.cache_tesseract.outputs.cache-hit != 'true' shell: powershell env: @@ -75,12 +71,6 @@ jobs: New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force Move-Item tesseract_files/tesseract_vcpkg/installed/* tesseract_files/tesseract_vcpkg/ ls tesseract_files/tesseract_vcpkg - - #- name: Download Tesseract binaries - # if: steps.cache_tesseract.outputs.cache-hit != 'true' - # shell: powershell - # run: | - # . ".\download_tesseract_windows.ps1" - name: NuGet restore shell: cmd