ci: enable all publish targets but universal mac build

This commit is contained in:
Huakun Shen 2025-01-07 02:07:29 -05:00
parent b33c5e5b59
commit 4a91523caa
No known key found for this signature in database
2 changed files with 14 additions and 14 deletions

View File

@ -2,8 +2,6 @@ name: "Desktop App Publish"
on: on:
push: push:
branches:
- "ci/release"
tags: tags:
- "v*" - "v*"
workflow_dispatch: workflow_dispatch:
@ -16,15 +14,15 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
settings: settings:
# - platform: "macos-14" # for Arm based macs (M1 and above). - platform: "macos-14" # for Arm based macs (M1 and above).
# 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"
# Universal Build no longer supported after adding openssl, which is not cross-compilable. # Universal Build no longer supported after adding openssl, which is not cross-compilable.
# - platform: "macos-14" # for Both Arm and Intel based macs. # - platform: "macos-14" # for Both Arm and Intel based macs.
# args: "--target universal-apple-darwin --verbose" # 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"
args: "--verbose" args: "--verbose"

View File

@ -23,18 +23,20 @@ if (process.platform === "win32") {
for (const dir of fs.readdirSync(programFilesDir)) { for (const dir of fs.readdirSync(programFilesDir)) {
console.log(dir) console.log(dir)
} }
const joinedOpenSSLDir = path.join(programFilesDir, "OpenSSL")
console.log(`joinedOpenSSLDir (${joinedOpenSSLDir}) exists: `, fs.existsSync(joinedOpenSSLDir))
console.log("joinedOpenSSLDir Directory Contents:")
for (const dir of fs.readdirSync(joinedOpenSSLDir)) {
console.log(dir)
}
console.log(`OPENSSL_DIR (${OPENSSL_DIR}) Exists: ${fs.existsSync(OPENSSL_DIR)}`) console.log(`OPENSSL_DIR (${OPENSSL_DIR}) Exists: ${fs.existsSync(OPENSSL_DIR)}`)
console.log( console.log(
`OPENSSL_INCLUDE_DIR (${OPENSSL_INCLUDE_DIR}) Exists: ${fs.existsSync(OPENSSL_INCLUDE_DIR)}` `OPENSSL_INCLUDE_DIR (${OPENSSL_INCLUDE_DIR}) Exists: ${fs.existsSync(OPENSSL_INCLUDE_DIR)}`
) )
console.log(`OPENSSL_LIB_DIR (${OPENSSL_LIB_DIR}) Exists: ${fs.existsSync(OPENSSL_LIB_DIR)}`) console.log(`OPENSSL_LIB_DIR (${OPENSSL_LIB_DIR}) Exists: ${fs.existsSync(OPENSSL_LIB_DIR)}`)
if (
!fs.existsSync(OPENSSL_DIR) ||
!fs.existsSync(OPENSSL_INCLUDE_DIR) ||
!fs.existsSync(OPENSSL_LIB_DIR)
) {
console.error("OPENSSL_DIR, OPENSSL_INCLUDE_DIR, or OPENSSL_LIB_DIR is not set")
process.exit(1)
}
} 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)) {