Skip to content

Commit c26a194

Browse files
authored
Upgrade deps and qode (#865)
* bump deps * fix test * fix node verison * 0.36.0 * revert tsconfig * add env * fix cmake build for windows * fix qode bump * temp fix
1 parent a577689 commit c26a194

11 files changed

Lines changed: 4044 additions & 9364 deletions

File tree

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-node@v2
1414
with:
15-
node-version: '14.x'
15+
node-version: '16.x'
1616
- name: Add key to allow access to repository
1717
env:
1818
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
git config --global user.email "actions@gihub.com"
3535
git config --global user.name "gh-actions"
36-
npm install --ignore-scripts
36+
yarn install --ignore-scripts
3737
npm run docs
3838
cd website
3939
if [ -e yarn.lock ]; then

.github/workflows/latest.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- uses: actions/setup-node@v2
1515
with:
16-
node-version: '14.x'
16+
node-version: '16.x'
1717
- name: Install deps
18-
run: npm install --ignore-scripts
18+
run: yarn install --ignore-scripts
1919
- name: Build nodegui
2020
run: npx tsc
2121
- name: Archive using npm pack
@@ -32,9 +32,9 @@ jobs:
3232
body: >
3333
Latest auto release corresponding to commit ${{github.sha}} 🔥.
3434
To install do:
35-
`npm install https://github.com/nodegui/nodegui/releases/download/v0.0.0-latest-master/nodegui-master.tgz`
35+
`yarn install https://github.com/nodegui/nodegui/releases/download/v0.0.0-latest-master/nodegui-master.tgz`
3636
or
37-
`npm install http://master-release.nodegui.org`
37+
`yarn install http://master-release.nodegui.org`
3838
assets: >
3939
nodegui-nodegui-0.0.0-latest-master.tgz:nodegui-master.tgz:application/tar+gzip
4040
recreate: true

.github/workflows/release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-node@v2
1414
with:
15-
node-version: '14.x'
15+
node-version: '16.x'
1616
- name: Install ubuntu deps
1717
run: sudo apt install mesa-common-dev libglu1-mesa-dev
18-
- run: npm install
18+
- run: yarn install
1919
- run: echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' >> .npmrc
2020
- run: npm publish --access=public
2121
env:
2222
NPM_TOKEN: ${{ secrets.NPM_PUBLISH_TOKEN }}
23+
CMAKE_BUILD_PARALLEL_LEVEL: 8

.github/workflows/test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ jobs:
1212
- uses: actions/checkout@v2
1313
- uses: actions/setup-node@v2
1414
with:
15-
node-version: '14.x'
15+
node-version: '16.x'
1616
- name: Install ubuntu deps
1717
if: contains(matrix.os, 'ubuntu')
1818
run: sudo apt install mesa-common-dev libglu1-mesa-dev
1919
- name: Install deps
20-
run: npm install
20+
run: yarn install
2121
- name: Build nodegui
2222
run: npm run build
23+
env:
24+
CMAKE_BUILD_PARALLEL_LEVEL: 8
2325
- name: Run tests
2426
run: npm run test
2527
- name: Run linters for cpp

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ if (WIN32)
228228
target_compile_definitions(${CORE_WIDGETS_ADDON} PRIVATE
229229
ENABLE_DLL_EXPORT=1
230230
)
231-
target_compile_options(${CORE_WIDGETS_ADDON} PRIVATE "/MP4")
231+
target_compile_options(${CORE_WIDGETS_ADDON} PRIVATE "/MP")
232232

233233
endif()
234234

config/qode.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ macro(AddQodeSupport addonName)
1616
message(STATUS "Using Qode installation for ${addonName} QODE_BINARY_DIR:${QODE_BINARY_DIR}")
1717

1818
target_link_libraries(${CORE_WIDGETS_ADDON} PRIVATE
19-
"${QODE_BINARY_DIR}\\qode.lib"
19+
"${QODE_BINARY_DIR}\\node.lib"
2020
)
2121

2222
endif()

0 commit comments

Comments
 (0)