Merge pull request #44 from danini/ci/fix-open-cv

Fix Windows OpenCV build
danini · Sep 14, 2023 · aae1f40 · aae1f40
2 parents fac954e + 6be076a
commit aae1f40
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -16,7 +16,10 @@ jobs:
   build_wheels:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    env:
+      MSVC_TOOLSET_VERSION: "14"
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
 
@@ -30,15 +33,15 @@ jobs:
         uses: TheMrMilchmann/[email protected]
         with:
           arch: x64
-          toolset: 14.36.32532
+          toolset: ${{ env.MSVC_TOOLSET_VERSION }}
 
       - name: Cache OpenCV build
         if: matrix.os == 'windows-latest'
         id: cache-opencv
         uses: actions/cache@v3
         with:
           path: D:/a/graph-cut-ransac/graph-cut-ransac/opencv
-          key: opencv3-4-5-${{ runner.os }}-${{ hashFiles('scripts/build-opencv.ps1') }}
+          key: opencv3-4-5-${{ runner.os }}-${{ env.MSVC_TOOLSET_VERSION }}-${{ hashFiles('scripts/build-opencv.ps1') }}
 
       - name: Build OpenCV on Windows
         if: matrix.os == 'windows-latest' && steps.cache-opencv.outputs.cache-hit != 'true'

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,6 @@
+repos:
+# Validate github workflow files
+- repo: https://github.com/python-jsonschema/check-jsonschema
+  rev: 0.26.3
+  hooks:
+    - id: check-github-workflows