Skip to content

Commit 2320b69

Browse files
authored
Merge branch 'main' into develop
2 parents 034e374 + 8deb54a commit 2320b69

6 files changed

Lines changed: 121 additions & 117 deletions

File tree

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
- uses: actions/checkout@v6
1515

1616
- name: Initialize CodeQL
17-
uses: github/codeql-action/init@v2
17+
uses: github/codeql-action/init@v4
1818
with:
1919
languages: javascript, typescript
2020

2121
- name: Autobuild
22-
uses: github/codeql-action/autobuild@v2
22+
uses: github/codeql-action/autobuild@v4
2323

2424
- name: Perform CodeQL Analysis
25-
uses: github/codeql-action/analyze@v2
25+
uses: github/codeql-action/analyze@v4

.github/workflows/notify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@v6
3434

3535
- name: Setup Node.js
36-
uses: actions/setup-node@v4
36+
uses: actions/setup-node@v6
3737
with:
3838
node-version: ${{ env.NODE_VERSION }}
3939

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
with:
7575
fetch-depth: 0
7676

77-
- uses: actions/setup-node@v4
77+
- uses: actions/setup-node@v6
7878
with:
7979
node-version: ${{ env.NODE_VERSION }}
8080

@@ -83,7 +83,7 @@ jobs:
8383
version: ${{ env.PNPM_VERSION }}
8484

8585
- name: pnpm store cache
86-
uses: actions/cache@v4
86+
uses: actions/cache@v5
8787
with:
8888
path: ~/.pnpm-store
8989
key: windows-pnpm-${{ hashFiles('pnpm-lock.yaml') }}
@@ -117,7 +117,7 @@ jobs:
117117
steps:
118118
- uses: actions/checkout@v6
119119

120-
- uses: actions/setup-node@v4
120+
- uses: actions/setup-node@v6
121121
with:
122122
node-version: ${{ env.NODE_VERSION }}
123123

@@ -153,7 +153,7 @@ jobs:
153153
steps:
154154
- uses: actions/checkout@v6
155155

156-
- uses: actions/setup-node@v4
156+
- uses: actions/setup-node@v6
157157
with:
158158
node-version: ${{ env.NODE_VERSION }}
159159

apps/desktop/renderer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"devDependencies": {
3333
"@eslint/js": "^9.39.1",
34-
"@types/node": "^24.10.1",
34+
"@types/node": "^25.2.0",
3535
"@types/react": "^19.2.5",
3636
"@types/react-dom": "^19.2.3",
3737
"@vitejs/plugin-react": "^5.1.1",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@electron/rebuild": "^4.0.3",
4949
"@trivago/prettier-plugin-sort-imports": "^6.0.2",
5050
"@types/electron-builder": "^2.8.2",
51-
"@types/node": "^24.10.9",
51+
"@types/node": "^25.2.0",
5252
"cross-env": "^7.0.3",
5353
"electron-builder": "^26.4.0",
5454
"husky": "^9.1.7",

0 commit comments

Comments
 (0)