Skip to content

Commit f7c6264

Browse files
committed
fix: 更新工作流以支持 ARM 架构并修正代理和重定向地址
1 parent 0d0e514 commit f7c6264

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/build-and-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
# job 1
1717
build-and-upload:
18-
runs-on: ${{ matrix.os }}-latest
18+
runs-on: ${{ contains(matrix.os, '-arm') && matrix.os || format('{0}-latest', matrix.os) }}
1919
env:
2020
ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
2121
ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder
@@ -25,7 +25,7 @@ jobs:
2525
os:
2626
- windows
2727
- ubuntu
28-
# - ubuntu-24.04-arm # 因难以申请到 ARM64 runner而放弃;注意该系统名称不应使用latest后缀
28+
- ubuntu-24.04-arm
2929
- macos
3030
node:
3131
- 22

.github/workflows/npm-run-electron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
npm-run-electron:
19-
runs-on: ${{ matrix.os }}-latest
19+
runs-on: ${{ contains(matrix.os, '-arm') && matrix.os || format('{0}-latest', matrix.os) }}
2020
env:
2121
ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
2222
ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder

.github/workflows/test-and-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ on:
2929

3030
jobs:
3131
test-and-upload:
32-
runs-on: ${{ matrix.os }}-latest
32+
runs-on: ${{ contains(matrix.os, '-arm') && matrix.os || format('{0}-latest', matrix.os) }}
3333
env:
3434
ELECTRON_CACHE: ${{ github.workspace }}/.cache/electron
3535
ELECTRON_BUILDER_CACHE: ${{ github.workspace }}/.cache/electron-builder

packages/core/src/config/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ const defaultConfig = {
221221
},
222222
'ajax.googleapis.com': {
223223
'.*': {
224-
proxy: 'ajax.lug.ustc.edu.cn',
224+
proxy: 'ajax.proxy.ustclug.org',
225225
backup: ['gapis.geekzu.org'],
226226
test: 'ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js',
227227
},
@@ -253,7 +253,7 @@ const defaultConfig = {
253253
// mapbox-node-binary.s3.amazonaws.com/sqlite3/v5.0.0/napi-v3-win32-x64.tar.gz
254254
'*.s3.1amazonaws1.com': {
255255
'/sqlite3/.*': {
256-
redirect: 'npm.taobao.org/mirrors',
256+
redirect: 'npmmirror.com/mirrors',
257257
},
258258
},
259259
// 'packages.elastic.co': { '.*': { proxy: 'elastic.proxy.ustclug.org' } },

0 commit comments

Comments
 (0)