Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
Armaldio committed Jan 31, 2024
2 parents 40dd453 + 0142839 commit 1117144
Show file tree
Hide file tree
Showing 5 changed files with 788 additions and 704 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ jobs:

# windows
- name: Add msbuild to PATH
run: yarn global add --production windows-build-tools --vs2022
run: yarn global add --production windows-build-tools --vs2019
# uses: microsoft/[email protected]
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2019'

# nw.js
# - if: matrix.runtime == 'nw.js'
Expand All @@ -112,7 +112,7 @@ jobs:
- if: matrix.runtime == 'nw.js'
run: |
yarn config set python python2.7
yarn config set msvs_version 2022
yarn config set msvs_version 2019
- run: git clone https://github.com/greenheartgames/greenworks greenworks

Expand Down Expand Up @@ -149,6 +149,11 @@ jobs:
id: package-version
uses: Saionaro/[email protected]

- name: "ls"
shell: bash
run:
ls greenworks/build/Release/

- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"modules-abi": "^1.1.0",
"mri": "^1.2.0",
"node-abi": "^3.28.0",
"node-gyp": "^9.3.0",
"node-gyp": "^10.0.1",
"nw-gyp": "^3.6.6",
"tar": "^6.1.12",
"unzipper": "^0.10.11"
Expand Down
Loading

0 comments on commit 1117144

Please sign in to comment.