diff --git a/.github/workflows/desktop-publish.yml b/.github/workflows/desktop-publish.yml index 57e64e1..48e39ee 100644 --- a/.github/workflows/desktop-publish.yml +++ b/.github/workflows/desktop-publish.yml @@ -2,8 +2,6 @@ name: "Desktop App Publish" on: push: - branches: - - "ci/release" tags: - "v*" workflow_dispatch: @@ -16,15 +14,15 @@ jobs: fail-fast: false matrix: settings: - # - platform: "macos-14" # for Arm based macs (M1 and above). - # args: "--target aarch64-apple-darwin --verbose" - # - platform: "macos-13" # for Intel based macs. - # args: "--target x86_64-apple-darwin --verbose" + - platform: "macos-14" # for Arm based macs (M1 and above). + args: "--target aarch64-apple-darwin --verbose" + - platform: "macos-13" # for Intel based macs. + args: "--target x86_64-apple-darwin --verbose" # Universal Build no longer supported after adding openssl, which is not cross-compilable. # - 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. - # args: "--verbose" + - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04. + args: "--verbose" - platform: "windows-latest" args: "--verbose" diff --git a/packages/ci/scripts/ci-env-check.ts b/packages/ci/scripts/ci-env-check.ts index fca6760..280e0c8 100644 --- a/packages/ci/scripts/ci-env-check.ts +++ b/packages/ci/scripts/ci-env-check.ts @@ -23,18 +23,20 @@ if (process.platform === "win32") { for (const dir of fs.readdirSync(programFilesDir)) { 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_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)}`) + 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") { if (OPENSSL_DIR) { if (fs.existsSync(OPENSSL_DIR)) {