Skip to content

Commit

Permalink
Merge pull request #23 from shimat/4.9.0
Browse files Browse the repository at this point in the history
4.9.0
  • Loading branch information
shimat authored Jan 10, 2024
2 parents dae576b + fda2fef commit 0ad3bee
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ on:
types: [synchronize, opened]

env:
OPENCV_VERSION: 4.8.0
OPENCV_VERSION: 4.9.0

jobs:
build:

strategy:
matrix:
platform: ["win", "uwp"]
platform: ["win"]
#platform: ["win", "uwp"]
arch: ["x86", "x64", "ARM"]
exclude:
- platform: win
Expand All @@ -22,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: recursive
Expand All @@ -33,10 +34,10 @@ jobs:
Install-WindowsFeature Server-Media-Foundation
- name: Add msbuild to PATH
uses: microsoft/[email protected]
uses: microsoft/setup-msbuild@v1.3.1

- name: Setup vcpkg
uses: lukka/run-vcpkg@v11.1
uses: lukka/run-vcpkg@v11.4
if: ${{ matrix.platform == 'win' }}
with:
vcpkgGitCommitId: "64adda19c86e89526b5e27703a193c14477cce07"
Expand Down
2 changes: 1 addition & 1 deletion opencv
Submodule opencv updated 1064 files
2 changes: 1 addition & 1 deletion opencv_contrib
Submodule opencv_contrib updated 111 files

0 comments on commit 0ad3bee

Please sign in to comment.