From 6511bc56d8b6a7aa8126054d79ac2f0f80f67a31 Mon Sep 17 00:00:00 2001 From: Albert Date: Fri, 22 Nov 2024 17:52:02 -0500 Subject: [PATCH] CI - Remove macOS OpenSSL Build --- .github/workflows/macos.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index e63e0cc98..89e3d2d74 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -47,25 +47,18 @@ jobs: fail-on-cache-miss: true - name: Setup OpenSSL run: | - if [[ "${{ matrix.arch }}" == "x64" ]]; then - HOMEBREW_X64_PATH="/usr/local/bin/brew" - arch -arm64 brew uninstall openssl@1.1 || true - arch -x86_64 $HOMEBREW_X64_PATH install openssl@1.1 - echo "WEBUI_TLS_INCLUDE=$($HOMEBREW_X64_PATH --prefix openssl@1.1)/include/" >> $GITHUB_ENV - echo "WEBUI_TLS_LIB=$($HOMEBREW_X64_PATH --prefix openssl@1.1)/lib/" >> $GITHUB_ENV - else - brew install openssl@1.1 - echo "WEBUI_TLS_INCLUDE=$(brew --prefix openssl@1.1)/include/" >> $GITHUB_ENV - echo "WEBUI_TLS_LIB=$(brew --prefix openssl@1.1)/lib/" >> $GITHUB_ENV - fi + echo "WEBUI_TLS_INCLUDE=$(brew --cellar)/openssl@1.1/1.1.1w/include/" >> $GITHUB_ENV + echo "WEBUI_TLS_LIB=$(brew --cellar)/openssl@1.1/1.1.1w/lib/" >> $GITHUB_ENV - name: Build Debug Target run: make ARCH_TARGET=${{ matrix.arch }} debug - name: Build Release Target if: ${{ !cancelled() }} run: make ARCH_TARGET=${{ matrix.arch }} - name: Build TLS Debug Target + if: ${{ matrix.arch != 'x64' }} run: make ARCH_TARGET=${{ matrix.arch }} WEBUI_USE_TLS=1 debug - name: Build TLS Release Target + if: ${{ matrix.arch != 'x64' }} run: make ARCH_TARGET=${{ matrix.arch }} WEBUI_USE_TLS=1 - name: Build examples run: | @@ -109,7 +102,6 @@ jobs: echo "TITLE=WebUI Nightly Build $(date -u +'%Y-%m-%d %H:%M:%S UTC')" echo "BODY=Generated from commit $GITHUB_SHA." } >> $GITHUB_ENV - fi - name: Update Nightly Tag if: env.IS_PRERELEASE uses: richardsimko/update-tag@v1