Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions .github/workflows/release-candidate.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Release Candidate
on:
push:
push:
tags:
- 'v*-b*'

Expand All @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
cache: "yarn"
# See https://github.com/nodejs/node-gyp/blob/main/docs/Force-npm-to-use-global-node-gyp.md
# https://github.com/nodejs/node-gyp/blob/main/docs/Updating-npm-bundled-node-gyp.md
Expand Down Expand Up @@ -43,12 +43,12 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
cache: "yarn"
- name: Configure Node
run: |
# npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
npm install -g npm@8
npm install -g npm@8
npm install -g node-gyp@latest
npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
- name: Install dependencies
Expand All @@ -68,15 +68,15 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
- name: Configure Node
shell: powershell
run: |
# npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
npm install -g npm@8
npm install -g npm@8
npm install -g node-gyp@latest
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
- name: Install dependencies
run: yarn install --immutable
- name: Build and Release
run: yarn release
run: yarn release
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
cache: "yarn"
# See https://github.com/nodejs/node-gyp/blob/main/docs/Force-npm-to-use-global-node-gyp.md
# https://github.com/nodejs/node-gyp/blob/main/docs/Updating-npm-bundled-node-gyp.md
Expand Down Expand Up @@ -42,12 +42,12 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
cache: "yarn"
- name: Configure Node
run: |
# npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
npm install -g npm@8
npm install -g npm@8
npm install -g node-gyp@latest
npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
- name: Install dependencies
Expand All @@ -67,15 +67,15 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
- name: Configure Node
shell: powershell
run: |
# npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
npm install -g npm@8
npm install -g npm@8
npm install -g node-gyp@latest
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
- name: Install dependencies
run: yarn install --immutable
- name: Build and Release
run: yarn release
run: yarn release
12 changes: 6 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
cache: "yarn"
# - name: Configure Node
# run: |
Expand All @@ -28,7 +28,7 @@ jobs:
run: yarn install --immutable
- name: Build
run: yarn build

MacOs:
runs-on: macos-latest
env:
Expand All @@ -37,12 +37,12 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
cache: "yarn"
- name: Configure Node
run: |
# npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
npm install -g npm@8
npm install -g npm@8
npm install -g node-gyp@latest
npm config set node_gyp $(npm prefix -g)/lib/node_modules/node-gyp/bin/node-gyp.js
# yarn set version stable
Expand All @@ -61,13 +61,13 @@ jobs:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: "18"
node-version: "22"
cache: "yarn"
- name: Configure Node
shell: powershell
run: |
# npm v9 doesn't allow custom config parameters (i.e. node_gyp) anymode, so we have to downgrade it to v8
npm install -g npm@8
npm install -g npm@8
npm install -g node-gyp@latest
npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
# yarn set version stable
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.15.0
22.14.0
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
## Installation

### Requirements
* node >= `18.x`
* yarn >= `1.19.x`
* node >= `22.x`
* yarn >= `4.x`

```bash
$ git clone https://github.com/getstation/desktop-app.git
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
"rimraf": "^5.0.10"
},
"devEngines": {
"node": ">=18.0.0",
"node": ">=22.0.0",
"yarn": ">=4.1.0"
},
"volta": {
"node": "18.14.0",
"node": "22.14.0",
"yarn": "4.1.0"
},
"packageManager": "[email protected]"
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"use-timeout": "^1.1.0",
"utility-types": "^3.7.0",
"uuid": "^3.3.3",
"windows-focus-assist": "patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch",
"windows-focus-assist": "^1.4.0",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should fix yarn release.
This change breaks it.

"ws": "^5.2.2"
},
"devDependencies": {
Expand Down
21 changes: 5 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29557,7 +29557,7 @@ __metadata:
webpack: "npm:^4.46.0"
webpack-cli: "npm:^3.3.12"
webpack-merge: "npm:^4.2.2"
windows-focus-assist: "patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch"
windows-focus-assist: "npm:^1.4.0"
write-file-webpack-plugin: "npm:^4.5.1"
ws: "npm:^5.2.2"
xvfb-maybe: "npm:^0.2.1"
Expand Down Expand Up @@ -32804,25 +32804,14 @@ __metadata:
languageName: node
linkType: hard

"windows-focus-assist@npm:1.3.0":
version: 1.3.0
resolution: "windows-focus-assist@npm:1.3.0"
dependencies:
bindings: "npm:^1.5.0"
node-addon-api: "npm:*"
node-gyp: "npm:latest"
checksum: 10c0/0a168df52e517e753fc3310dc3be04c37ca8c9a1afa84798a4ec5db252939382b866b76bf3656ed4b42d79ceed551f620307fb632d3e183cd7bea31a03f10c70
languageName: node
linkType: hard

"windows-focus-assist@patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch":
version: 1.3.0
resolution: "windows-focus-assist@patch:windows-focus-assist@npm%3A1.3.0#~/.yarn/patches/windows-focus-assist-npm-1.3.0-e02310a164.patch::version=1.3.0&hash=5e48fb"
"windows-focus-assist@npm:^1.4.0":
version: 1.4.0
resolution: "windows-focus-assist@npm:1.4.0"
dependencies:
bindings: "npm:^1.5.0"
node-addon-api: "npm:*"
node-gyp: "npm:latest"
checksum: 10c0/394ad49aaf273fed06dcccb55deab787387b50263c425fb9b035cd43f52d4cad37e0e63739d92784fc4a554496369672edda80ea8f84201c401028f0566ed5aa
checksum: 10c0/e0df9e7906f218772cb9fe81bd64a71643a7ac90ef457fa40e608b793800f72e1eea981fdd25f445adda00cb1d95f7f5e2de15ad0283ec098f8303a70bc4c83c
languageName: node
linkType: hard

Expand Down