Merge branch 'develop'
This commit is contained in:
commit
a21936473a
3 files changed
+16
-5
No files matched your search
@@ -25,16 +25,19 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: '20'
|
node-version: '20'
|
||||||
|
|
||||||
- name: Configure Git for HTTPS
|
- name: Configure Git to use HTTPS instead of SSH
|
||||||
run: |
|
run: |
|
||||||
git config --global url."https://github.com/".insteadOf ssh://git@github.com/
|
git config --global url."https://github.com/".insteadOf git@github.com:
|
||||||
git config --global url."https://".insteadOf git://
|
git config --global url."https://".insteadOf git://
|
||||||
|
|
||||||
- name: Setup pnpm
|
- name: Setup pnpm
|
||||||
uses: pnpm/action-setup@v4
|
uses: pnpm/action-setup@v4
|
||||||
with:
|
with:
|
||||||
version: 9
|
version: 9
|
||||||
|
run_install: |
|
||||||
|
- recursive: true
|
||||||
|
args: [--frozen-lockfile=false]
|
||||||
|
|
||||||
- name: Get pnpm store directory
|
- name: Get pnpm store directory
|
||||||
id: pnpm-cache
|
id: pnpm-cache
|
||||||
run: |
|
run: |
|
||||||
@@ -49,7 +52,9 @@ jobs:
|
|||||||
${{ runner.os }}-pnpm-store-
|
${{ runner.os }}-pnpm-store-
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: pnpm install
|
run: pnpm install --no-frozen-lockfile
|
||||||
|
env:
|
||||||
|
NPM_CONFIG_LEGACY_PEER_DEPS: true
|
||||||
|
|
||||||
- name: Setup Git user
|
- name: Setup Git user
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -1 +1,2 @@
|
|||||||
electron_mirror=https://npmmirror.com/mirrors/electron/
|
shamefully-hoist=true
|
||||||
|
strict-peer-dependencies=false
|
||||||
@@ -88,6 +88,11 @@
|
|||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=20.0.0"
|
"node": ">=20.0.0"
|
||||||
},
|
},
|
||||||
|
"pnpm": {
|
||||||
|
"overrides": {
|
||||||
|
"node-gyp": "latest"
|
||||||
|
}
|
||||||
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mdi/font": "^7.4.47",
|
"@mdi/font": "^7.4.47",
|
||||||
"@vueuse/core": "^14.0.0",
|
"@vueuse/core": "^14.0.0",
|
||||||
|
|||||||
Reference in new issue
Block a user