diff --git a/.github/workflows/desktop-publish.yml b/.github/workflows/desktop-publish.yml index a16db5f..34fb682 100644 --- a/.github/workflows/desktop-publish.yml +++ b/.github/workflows/desktop-publish.yml @@ -61,9 +61,9 @@ jobs: run: | choco install protoc choco install openssl - echo OPENSSL_DIR='"C:\\Program Files\\OpenSSL-Win64"' >> $env:GITHUB_ENV - echo OPENSSL_INCLUDE_DIR='"C:\\Program Files\\OpenSSL-Win64\\include"' >> $env:GITHUB_ENV - echo OPENSSL_LIB_DIR='"C:\\Program Files\\OpenSSL-Win64\\lib\\VC\\x64\\MDd"' >> $env:GITHUB_ENV + echo OPENSSL_DIR='"C:\\Program Files\\OpenSSL"' >> $env:GITHUB_ENV + echo OPENSSL_INCLUDE_DIR='"C:\\Program Files\\OpenSSL\\include"' >> $env:GITHUB_ENV + echo OPENSSL_LIB_DIR='"C:\\Program Files\\OpenSSL\\lib\\VC\\x64\\MDd"' >> $env:GITHUB_ENV - name: Install Rust stable uses: dtolnay/rust-toolchain@stable diff --git a/packages/ci/scripts/ci-env-check.ts b/packages/ci/scripts/ci-env-check.ts index b1135bd..a5bd5a7 100644 --- a/packages/ci/scripts/ci-env-check.ts +++ b/packages/ci/scripts/ci-env-check.ts @@ -1,51 +1,52 @@ -import fs from 'fs' +import fs from "fs" + // run the following only on windows -const OPENSSL_DIR = process.env.OPENSSL_DIR; -const OPENSSL_INCLUDE_DIR = process.env.OPENSSL_INCLUDE_DIR; -const OPENSSL_LIB_DIR = process.env.OPENSSL_LIB_DIR; +const OPENSSL_DIR = process.env.OPENSSL_DIR +const OPENSSL_INCLUDE_DIR = process.env.OPENSSL_INCLUDE_DIR +const OPENSSL_LIB_DIR = process.env.OPENSSL_LIB_DIR -console.log("OPENSSL_DIR", OPENSSL_DIR); -console.log("OPENSSL_INCLUDE_DIR", OPENSSL_INCLUDE_DIR); -console.log("OPENSSL_LIB_DIR", OPENSSL_LIB_DIR); +console.log("OPENSSL_DIR", OPENSSL_DIR) +console.log("OPENSSL_INCLUDE_DIR", OPENSSL_INCLUDE_DIR) +console.log("OPENSSL_LIB_DIR", OPENSSL_LIB_DIR) - -if (process.platform === 'win32') { +if (process.platform === "win32") { + // check if each directory exists + if (!OPENSSL_DIR || !OPENSSL_INCLUDE_DIR || !OPENSSL_LIB_DIR) { + console.error("OPENSSL_DIR, OPENSSL_INCLUDE_DIR, or OPENSSL_LIB_DIR is not set") + process.exit(1) + } + const programFilesDir = "C:\\Program Files" + console.log( + `Program Files Directory (${programFilesDir}) Exists: ${fs.existsSync(programFilesDir)}` + ) - // check if each directory exists - if (!OPENSSL_DIR || !OPENSSL_INCLUDE_DIR || !OPENSSL_LIB_DIR) { - console.error("OPENSSL_DIR, OPENSSL_INCLUDE_DIR, or OPENSSL_LIB_DIR is not set"); - process.exit(1); - } - - // check if each directory exists - if (!fs.existsSync(OPENSSL_DIR)) { - console.error("OPENSSL_DIR does not exist", OPENSSL_DIR); - process.exit(1); - } 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); - } + // check if each directory exists + if (!fs.existsSync(OPENSSL_DIR)) { + console.error("OPENSSL_DIR does not exist", OPENSSL_DIR) + process.exit(1) + } 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") { - if (OPENSSL_DIR) { - if (fs.existsSync(OPENSSL_DIR)) { - console.log("OPENSSL_DIR exists", OPENSSL_DIR); - } else { - console.error("OPENSSL_DIR does not exist", OPENSSL_DIR); - } - - } + if (OPENSSL_DIR) { + if (fs.existsSync(OPENSSL_DIR)) { + console.log("OPENSSL_DIR exists", OPENSSL_DIR) + } else { + console.error("OPENSSL_DIR does not exist", OPENSSL_DIR) + } + } } else if (process.platform === "linux") { - }