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