Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Add support for windows-2022 #15

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for windows-2022 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9204ff3
Update ci.yaml
kokarn Nov 30, 2021
c6c638b
Update tagged_release.yaml
kokarn Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test:
strategy:
matrix:
os: [ ubuntu-latest, windows-2016, macos-latest ]
os: [ ubuntu-latest, windows-2016, macos-latest, windows-2022 ]
node: [ "12.0.0", "14.0.0", "15.0.0", "16.0.0", "17.0.0" ]
task: [ test ]

Expand All @@ -25,6 +25,9 @@ jobs:
- name: Configure msvs version on Windows
if: ${{matrix.os == 'windows-2016'}}
run: npm config set msvs_version 2017
- name: Configure msvs version on Windows
if: ${{matrix.os == 'windows-2022'}}
run: npm config set msvs_version 2022
- name: Run tests
env:
OPENCV4NODEJS_DISABLE_AUTOBUILD: 1
Expand All @@ -35,4 +38,4 @@ jobs:
cd ./test
npm install --unsafe-perm
npm test
npm run test-externalMemTracking
npm run test-externalMemTracking
12 changes: 9 additions & 3 deletions .github/workflows/tagged_release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
prebuild-node:
strategy:
matrix:
os: [ ubuntu-latest, windows-2016, macos-latest ]
os: [ ubuntu-latest, windows-2016, macos-latest, windows-2022 ]
node: [ 14]
task: [ prebuild ]
runtime: [ node ]
Expand All @@ -24,6 +24,9 @@ jobs:
- name: Configure msvs version on Windows
if: ${{matrix.os == 'windows-2016'}}
run: npm config set msvs_version 2017
- name: Configure msvs version on Windows
if: ${{matrix.os == 'windows-2022'}}
run: npm config set msvs_version 2022
- name: Install
run: npm ci --unsafe-perm
- name: Publish prebuild
Expand All @@ -33,7 +36,7 @@ jobs:
prebuild-electron:
strategy:
matrix:
os: [ ubuntu-latest, windows-2016, macos-latest ]
os: [ ubuntu-latest, windows-2016, macos-latest, windows-2022 ]
node: [ 14 ]
task: [ prebuild ]
runtime: [ electron ]
Expand All @@ -49,6 +52,9 @@ jobs:
- name: Configure msvs version on Windows
if: ${{matrix.os == 'windows-2016'}}
run: npm config set msvs_version 2017
- name: Configure msvs version on Windows
if: ${{matrix.os == 'windows-2022'}}
run: npm config set msvs_version 2022
- name: Install
run: npm ci --unsafe-perm
- name: Publish prebuild
Expand All @@ -70,4 +76,4 @@ jobs:
- name: Publish tagged release
uses: JS-DevTools/npm-publish@v1
with:
token: ${{ secrets.NPM_TOKEN }}
token: ${{ secrets.NPM_TOKEN }}