diff --git a/.github/workflows/beta.yml b/.github/workflows/build.yml similarity index 99% rename from .github/workflows/beta.yml rename to .github/workflows/build.yml index f528079..ae8764f 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - beta + - main jobs: build: runs-on: ${{ matrix.os }} diff --git a/electron-builder.yml b/electron-builder.yml index 2228544..33f2b55 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -10,8 +10,7 @@ files: - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}' - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}' asarUnpack: - - ./resources/iconTemplate.png - - ./resources/index.html + - ./resources/* win: target: - target: "nsis" @@ -24,6 +23,8 @@ win: to: "Resources" - from: "./resources/index.html" to: "Resources" + - from: "./resources/frpc/win/${arch}/frpc.exe" + to: "Resources" nsis: oneClick: false artifactName: ${name}-${version}-${arch}.${ext} @@ -50,6 +51,8 @@ mac: to: "Resources" - from: "./resources/index.html" to: "Resources" + - from: "./resources/frpc/mac/${arch}/frpc" + to: "Resources" dmg: artifactName: ${name}-${version}-${arch}.${ext} npmRebuild: false diff --git a/resources/frpc/mac/arm64/frpc b/resources/frpc/mac/arm64/frpc new file mode 100755 index 0000000..4d3dd8b Binary files /dev/null and b/resources/frpc/mac/arm64/frpc differ diff --git a/resources/frpc/mac/x64/frpc b/resources/frpc/mac/x64/frpc new file mode 100755 index 0000000..342b72c Binary files /dev/null and b/resources/frpc/mac/x64/frpc differ diff --git a/resources/frpc/win/arm64/frpc.exe b/resources/frpc/win/arm64/frpc.exe new file mode 100755 index 0000000..7745a2b Binary files /dev/null and b/resources/frpc/win/arm64/frpc.exe differ diff --git a/resources/frpc/win/x64/frpc.exe b/resources/frpc/win/x64/frpc.exe new file mode 100755 index 0000000..676afd5 Binary files /dev/null and b/resources/frpc/win/x64/frpc.exe differ diff --git a/src/renderer/index.html b/src/renderer/index.html index 1c5f25c..733242c 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -3,7 +3,7 @@
-