Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Commit 408209a

Browse files
committed
Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop
2 parents 4570e80 + b85f052 commit 408209a

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

.github/actions/build-electron/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
# Certificate setup
2222
- name: Import Apple certificates
2323
if: inputs.os == 'macos'
24-
uses: apple-actions/import-codesign-certs@v3
24+
uses: apple-actions/import-codesign-certs@v5
2525
with:
2626
p12-file-base64: ${{ env.APPLE_APP_CERTIFICATE_BASE64 }}
2727
p12-password: ${{ env.APPLE_APP_CERTIFICATE_PASSWORD }}
@@ -30,7 +30,7 @@ runs:
3030

3131
- name: Install Installer certificate
3232
if: inputs.os == 'macos'
33-
uses: apple-actions/import-codesign-certs@v3
33+
uses: apple-actions/import-codesign-certs@v5
3434
with:
3535
p12-file-base64: ${{ env.APPLE_INSTALLER_CERTIFICATE_BASE64 }}
3636
p12-password: ${{ env.APPLE_INSTALLER_CERTIFICATE_PASSWORD }}

package-lock.json

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@
128128
"multer": "1.4.5-lts.2",
129129
"normalize-strings": "1.1.1",
130130
"normalize.css": "8.0.1",
131-
"ollama": "0.5.14",
132-
"openai": "4.93.0",
131+
"ollama": "0.5.15",
132+
"openai": "4.95.0",
133133
"rand-token": "1.0.1",
134134
"safe-compare": "1.1.4",
135135
"sanitize-filename": "1.6.3",
@@ -169,7 +169,7 @@
169169
"@fullcalendar/timegrid": "6.1.17",
170170
"@mermaid-js/layout-elk": "0.1.7",
171171
"@mind-elixir/node-menu": "1.0.5",
172-
"@playwright/test": "1.51.1",
172+
"@playwright/test": "1.52.0",
173173
"@popperjs/core": "2.11.8",
174174
"@stylistic/eslint-plugin": "4.2.0",
175175
"@types/archiver": "6.0.3",

0 commit comments

Comments
 (0)