Skip to content

Commit e010349

Browse files
authored
Update windows.yml
1 parent ff68d1a commit e010349

File tree

1 file changed

+9
-19
lines changed

1 file changed

+9
-19
lines changed

.github/workflows/windows.yml

+9-19
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,20 @@ jobs:
3737
path: ${{ github.workspace }}/opencv_files
3838
key: opencv-${{ env.OPENCV_VERSION }}-rev2
3939

40-
- name: Download OpenCV binaries by gh
40+
- name: Download OpenCV binaries
4141
if: steps.cache_opencv.outputs.cache-hit != 'true'
4242
shell: powershell
4343
env:
4444
GH_TOKEN: ${{ github.token }}
4545
run: |
46-
gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x64.zip"
47-
gh release download --repo shimat/opencv_files 4.10.0.20240612 --pattern "opencv4100_win_x86.zip"
48-
Expand-Archive -Path opencv4100_win_x64.zip -DestinationPath opencv_files/opencv4100_win_x64 -Force -ErrorAction Stop
49-
Expand-Archive -Path opencv4100_win_x86.zip -DestinationPath opencv_files/opencv4100_win_x86 -Force -ErrorAction Stop
46+
$OPENCV_FILES_TAG = "4.10.0.20240612"
47+
$OPENCV_VERSION = "4100"
48+
gh release download --repo shimat/opencv_files $OPENCV_FILES_TAG --pattern "opencv${OPENCV_VERSION}_win_x64.zip"
49+
gh release download --repo shimat/opencv_files $OPENCV_FILES_TAG --pattern "opencv${OPENCV_VERSION}_win_x86.zip"
50+
Expand-Archive -Path opencv${OPENCV_VERSION}_win_x64.zip -DestinationPath opencv_files/opencv4100_win_x64 -Force -ErrorAction Stop
51+
Expand-Archive -Path opencv${OPENCV_VERSION}_win_x86.zip -DestinationPath opencv_files/opencv4100_win_x86 -Force -ErrorAction Stop
5052
ls opencv_files
51-
ls opencv_files/opencv4100_win_x64
52-
53-
#- name: Download OpenCV binaries
54-
# if: steps.cache_opencv.outputs.cache-hit != 'true'
55-
# shell: powershell
56-
# run: |
57-
# . ".\download_opencv_windows.ps1"
53+
ls opencv_files/opencv${OPENCV_VERSION}_win_x64
5854
5955
- name: Cache Tesseract binaries
6056
id: cache_tesseract
@@ -63,7 +59,7 @@ jobs:
6359
path: ${{ github.workspace }}/tesseract_files
6460
key: tesseract-41-rev1
6561

66-
- name: Download Tesseract binaries by gh
62+
- name: Download Tesseract binaries
6763
if: steps.cache_tesseract.outputs.cache-hit != 'true'
6864
shell: powershell
6965
env:
@@ -75,12 +71,6 @@ jobs:
7571
New-Item tesseract_files/tesseract_vcpkg -ItemType Directory -Force
7672
Move-Item tesseract_files/tesseract_vcpkg/installed/* tesseract_files/tesseract_vcpkg/
7773
ls tesseract_files/tesseract_vcpkg
78-
79-
#- name: Download Tesseract binaries
80-
# if: steps.cache_tesseract.outputs.cache-hit != 'true'
81-
# shell: powershell
82-
# run: |
83-
# . ".\download_tesseract_windows.ps1"
8474
8575
- name: NuGet restore
8676
shell: cmd

0 commit comments

Comments
 (0)