From 3a4087e3eec55a7b9d30d6533b47c816e87076d3 Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Sun, 19 Apr 2026 21:45:47 +0200 Subject: [PATCH] CI: remove openssl workaround --- .github/scripts/.build.zsh | 4 ++++ .github/scripts/utils.zsh/check_macos | 3 --- .github/workflows/build-project.yaml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/scripts/.build.zsh b/.github/scripts/.build.zsh index d7189520..e7af3491 100755 --- a/.github/scripts/.build.zsh +++ b/.github/scripts/.build.zsh @@ -255,6 +255,10 @@ ${_usage_host:-}" cmake_args+=( -DCMAKE_PREFIX_PATH="${advss_deps_path}" + -DOPENSSL_ROOT_DIR="${advss_deps_path}" + -DOPENSSL_INCLUDE_DIR="${advss_deps_path}/include" + -DOPENSSL_CRYPTO_LIBRARY="${advss_deps_path}/lib/libcrypto.a" + -DOPENSSL_SSL_LIBRARY="${advss_deps_path}/lib/libssl.a" --preset ${_preset} ) diff --git a/.github/scripts/utils.zsh/check_macos b/.github/scripts/utils.zsh/check_macos index fc9dd74b..707fbeb9 100644 --- a/.github/scripts/utils.zsh/check_macos +++ b/.github/scripts/utils.zsh/check_macos @@ -18,7 +18,4 @@ if (( ! ${+commands[brew]} )) { } brew bundle --file ${SCRIPT_HOME}/.Brewfile -# Workaround to make sure locally built openssl is picked up by cmake -brew uninstall --ignore-dependencies openssl@3 || true -rehash || true log_group diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index a03b5190..c2969c49 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -6,7 +6,7 @@ on: description: "Project name detected by parsing build spec file" value: ${{ jobs.check-event.outputs.pluginName }} env: - DEP_DIR: .deps/advss-build-dependencies-3 + DEP_DIR: .deps/advss-build-dependencies-4 jobs: check-event: name: Check GitHub Event Data 🔎