mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-16 14:40:12 +01:00
🔥 Windows 端不再支持 32 位系统 Fix https://github.com/siyuan-note/siyuan/issues/6386
This commit is contained in:
parent
7a7ae253b6
commit
142abbe8e1
6 changed files with 2 additions and 86 deletions
9
.github/workflows/ci.yml
vendored
9
.github/workflows/ci.yml
vendored
|
|
@ -100,15 +100,6 @@ jobs:
|
||||||
mingwsys: "MINGW64"
|
mingwsys: "MINGW64"
|
||||||
goarch: "amd64"
|
goarch: "amd64"
|
||||||
suffix: "win.exe"
|
suffix: "win.exe"
|
||||||
- os: windows-2019
|
|
||||||
kernel_path: "../app/kernel32/SiYuan-Kernel.exe"
|
|
||||||
build_args: "-s -w -H=windowsgui -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod"
|
|
||||||
electron_args: "dist-win32"
|
|
||||||
goos: "windows"
|
|
||||||
mingwsys: "MINGW32"
|
|
||||||
goarch: "386"
|
|
||||||
gobin: "bin\\windows_386"
|
|
||||||
suffix: "win32.exe"
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
|
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
productName: "SiYuan"
|
|
||||||
appId: "org.b3log.siyuan"
|
|
||||||
asar: false
|
|
||||||
compression: "normal"
|
|
||||||
copyright: "© 2021 Yunnan Liandi Technology Co., Ltd."
|
|
||||||
artifactName: "siyuan-${version}-${os}32.${ext}"
|
|
||||||
extraMetadata:
|
|
||||||
main: "electron/main.js"
|
|
||||||
directories:
|
|
||||||
output: "build"
|
|
||||||
files:
|
|
||||||
- "electron"
|
|
||||||
extraFiles:
|
|
||||||
- from: "../LICENSE"
|
|
||||||
to: "LICENSE"
|
|
||||||
win:
|
|
||||||
icon: "src/assets/icon.ico"
|
|
||||||
extraResources:
|
|
||||||
- from: "kernel32"
|
|
||||||
to: "kernel"
|
|
||||||
requestedExecutionLevel: "asInvoker"
|
|
||||||
# certificateSubjectName: "Yunnan Liandi Technology Co., Ltd."
|
|
||||||
signingHashAlgorithms: [ 'sha256' ]
|
|
||||||
#rfc3161TimeStampServer: "http://sha256timestamp.ws.symantec.com/sha256/timestamp"
|
|
||||||
#rfc3161TimeStampServer: "http://time.certum.pl"
|
|
||||||
rfc3161TimeStampServer: "http://timestamp.entrust.net/TSS/RFC3161sha2TS"
|
|
||||||
target:
|
|
||||||
- target: "nsis"
|
|
||||||
nsis:
|
|
||||||
oneClick: true
|
|
||||||
perMachine: false
|
|
||||||
allowToChangeInstallationDirectory: false
|
|
||||||
allowElevation: true
|
|
||||||
deleteAppDataOnUninstall: false
|
|
||||||
createDesktopShortcut: true
|
|
||||||
createStartMenuShortcut: true
|
|
||||||
shortcutName: "SiYuan"
|
|
||||||
license: "../LICENSE"
|
|
||||||
include: "installer.nsh"
|
|
||||||
|
|
||||||
extraResources:
|
|
||||||
- from: "appearance/boot"
|
|
||||||
to: "appearance/boot"
|
|
||||||
filter: "!**/{.DS_Store}"
|
|
||||||
- from: "stage"
|
|
||||||
to: "stage"
|
|
||||||
- from: "guide"
|
|
||||||
to: "guide"
|
|
||||||
filter: "!**/{.DS_Store,.git,.gitignore,.idea}"
|
|
||||||
- from: "appearance/icons"
|
|
||||||
to: "appearance/icons"
|
|
||||||
filter: "!**/{.DS_Store}"
|
|
||||||
- from: "appearance/langs"
|
|
||||||
to: "appearance/langs"
|
|
||||||
filter: "!**/{.DS_Store}"
|
|
||||||
- from: "appearance/emojis"
|
|
||||||
to: "appearance/emojis"
|
|
||||||
filter: "!**/{.DS_Store}"
|
|
||||||
- from: "appearance/themes/midnight"
|
|
||||||
to: "appearance/themes/midnight"
|
|
||||||
filter: "!**/{.DS_Store,custom.css}"
|
|
||||||
- from: "appearance/themes/daylight"
|
|
||||||
to: "appearance/themes/daylight"
|
|
||||||
filter: "!**/{.DS_Store,custom.css}"
|
|
||||||
- from: "pandoc/pandoc-windows-386.zip"
|
|
||||||
to: "pandoc.zip"
|
|
||||||
|
|
@ -18,7 +18,6 @@
|
||||||
"start": "NODE_ENV=development electron ./electron/main.js",
|
"start": "NODE_ENV=development electron ./electron/main.js",
|
||||||
"dist-appx": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --config electron-appx-builder.yml",
|
"dist-appx": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --config electron-appx-builder.yml",
|
||||||
"dist": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --config electron-builder.yml",
|
"dist": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --config electron-builder.yml",
|
||||||
"dist-win32": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --ia32 --windows --config electron-builder-win32.yml",
|
|
||||||
"dist-darwin": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --mac --config electron-builder-darwin.yml",
|
"dist-darwin": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --mac --config electron-builder-darwin.yml",
|
||||||
"dist-darwin-arm64": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --arm64 --mac --config electron-builder-darwin-arm64.yml",
|
"dist-darwin-arm64": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --arm64 --mac --config electron-builder-darwin-arm64.yml",
|
||||||
"dist-linux": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --linux --config electron-builder-linux.yml"
|
"dist-linux": "ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ electron-builder --linux --config electron-builder-linux.yml"
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -114,11 +114,7 @@ func getUpdatePkg() (downloadPkgURL, checksum string, err error) {
|
||||||
|
|
||||||
var suffix string
|
var suffix string
|
||||||
if gulu.OS.IsWindows() {
|
if gulu.OS.IsWindows() {
|
||||||
if "386" == runtime.GOARCH {
|
suffix = "win.exe"
|
||||||
suffix = "win32.exe"
|
|
||||||
} else {
|
|
||||||
suffix = "win.exe"
|
|
||||||
}
|
|
||||||
} else if gulu.OS.IsDarwin() {
|
} else if gulu.OS.IsDarwin() {
|
||||||
if "arm64" == runtime.GOARCH {
|
if "arm64" == runtime.GOARCH {
|
||||||
suffix = "mac-arm64.dmg"
|
suffix = "mac-arm64.dmg"
|
||||||
|
|
|
||||||
|
|
@ -22,16 +22,12 @@ set GOOS=windows
|
||||||
set GOARCH=amd64
|
set GOARCH=amd64
|
||||||
go build --tags fts5 -v -o "../app/kernel/SiYuan-Kernel.exe" -ldflags "-s -w -H=windowsgui" .
|
go build --tags fts5 -v -o "../app/kernel/SiYuan-Kernel.exe" -ldflags "-s -w -H=windowsgui" .
|
||||||
|
|
||||||
set GOOS=windows
|
|
||||||
set GOARCH=386
|
|
||||||
go build --tags fts5 -v -o "../app/kernel32/SiYuan-Kernel.exe" -ldflags "-s -w -H=windowsgui" .
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
echo 'Building Electron'
|
echo 'Building Electron'
|
||||||
cd app
|
cd app
|
||||||
call pnpm run dist
|
call pnpm run dist
|
||||||
echo 'Building Electron win32'
|
|
||||||
call pnpm run dist-win32
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
echo 'Building Appx'
|
echo 'Building Appx'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue