hk/kunkun
1
0
Fork 0
mirror of https://github.com/kunkunsh/kunkun.git synced 2025-04-20 05:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: remove universal build support for macOS and simplify OpenSSL checks

Browse Source 
- Commented out the macOS 14 universal build configuration in the CI workflow due to OpenSSL cross-compilation issues.
- Simplified the OpenSSL directory existence checks in the environment check script for better logging and error handling on Windows and macOS platforms.
This commit is contained in:
Huakun Shen 2025-01-07 01:15:53 -05:00
parent e11343169c
commit 5ff90481bb
No known key found for this signature in database
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/desktop-publish.yml vendored
View File

@ -20,8 +20,9 @@ jobs:
# args: "--target aarch64-apple-darwin --verbose" # args: "--target aarch64-apple-darwin --verbose"
# - platform: "macos-13" # for Intel based macs. # - platform: "macos-13" # for Intel based macs.
# args: "--target x86_64-apple-darwin --verbose" # args: "--target x86_64-apple-darwin --verbose"
- platform: "macos-14" # for Both Arm and Intel based macs. # Universal Build no longer supported after adding openssl, which is not cross-compilable.
args: "--target universal-apple-darwin --verbose" # - platform: "macos-14" # for Both Arm and Intel based macs.
# args: "--target universal-apple-darwin --verbose"
# - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. # - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
# args: "--verbose" # args: "--verbose"
- platform: "windows-latest" - platform: "windows-latest"

27
packages/ci/scripts/ci-env-check.ts
View File

@ -20,32 +20,17 @@ if (process.platform === "win32") {
console.log( console.log(
`Program Files Directory (${programFilesDir}) Exists: ${fs.existsSync(programFilesDir)}` `Program Files Directory (${programFilesDir}) Exists: ${fs.existsSync(programFilesDir)}`
) )
console.log(`OPENSSL_DIR (${OPENSSL_DIR}) Exists: ${fs.existsSync(OPENSSL_DIR)}`)
// check if each directory exists console.log(
if (!fs.existsSync(OPENSSL_DIR)) { `OPENSSL_INCLUDE_DIR (${OPENSSL_INCLUDE_DIR}) Exists: ${fs.existsSync(OPENSSL_INCLUDE_DIR)}`
console.error("OPENSSL_DIR does not exist", OPENSSL_DIR) )
process.exit(1) console.log(`OPENSSL_LIB_DIR (${OPENSSL_LIB_DIR}) Exists: ${fs.existsSync(OPENSSL_LIB_DIR)}`)
} else {
console.log("OPENSSL_DIR exists", OPENSSL_DIR)
}
if (!fs.existsSync(OPENSSL_INCLUDE_DIR)) {
console.error("OPENSSL_INCLUDE_DIR does not exist", OPENSSL_INCLUDE_DIR)
process.exit(1)
} else {
console.log("OPENSSL_INCLUDE_DIR exists", OPENSSL_INCLUDE_DIR)
}
if (!fs.existsSync(OPENSSL_LIB_DIR)) {
console.error("OPENSSL_LIB_DIR does not exist", OPENSSL_LIB_DIR)
process.exit(1)
} else {
console.log("OPENSSL_LIB_DIR exists", OPENSSL_LIB_DIR)
}
} else if (process.platform === "darwin") { } else if (process.platform === "darwin") {
if (OPENSSL_DIR) { if (OPENSSL_DIR) {
if (fs.existsSync(OPENSSL_DIR)) { if (fs.existsSync(OPENSSL_DIR)) {
console.log("OPENSSL_DIR exists", OPENSSL_DIR) console.log("OPENSSL_DIR exists", OPENSSL_DIR)
} else { } else {
console.error("OPENSSL_DIR does not exist", OPENSSL_DIR) console.log("OPENSSL_DIR does not exist", OPENSSL_DIR)
} }
} }
} else if (process.platform === "linux") { } else if (process.platform === "linux") {