diff --git a/.github/workflows/mac_packaged.yml b/.github/workflows/mac_packaged.yml index ac7c8145ba..5c0ba84aa1 100644 --- a/.github/workflows/mac_packaged.yml +++ b/.github/workflows/mac_packaged.yml @@ -95,15 +95,15 @@ jobs: git clone --depth=1 $GIT/xiph/rnnoise.git cd rnnoise ./autogen.sh - ./configure --disable-examples --disable-doc + ./configure --prefix=$LibrariesPath/local/rnnoise --disable-examples --disable-doc make -j$(sysctl -n hw.logicalcpu) - sudo make install + make install - name: WebRTC cache. id: cache-webrtc uses: actions/cache@v5 with: - path: ${{ env.LibrariesPath }}/tg_owt + path: ${{ env.LibrariesPath }}/local/tg_owt key: ${{ runner.OS }}-webrtc-${{ env.WEBRTC }}-${{ env.CACHE_KEY }} - name: WebRTC. if: steps.cache-webrtc.outputs.cache-hit != 'true' @@ -115,17 +115,19 @@ jobs: cmake -Bbuild -GNinja . \ -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=$LibrariesPath/local/tg_owt \ -DCMAKE_C_FLAGS_DEBUG="" \ -DCMAKE_CXX_FLAGS_DEBUG="" \ -DCMAKE_DISABLE_FIND_PACKAGE_absl=ON cmake --build build --parallel + cmake --install build - name: TDE2E cache. id: cache-tde2e uses: actions/cache@v5 with: - path: ${{ env.LibrariesPath }}/tde2e + path: ${{ env.LibrariesPath }}/local/tde2e key: ${{ runner.OS }}-tde2e-${{ env.TDE2E }}-${{ env.CACHE_KEY }} - name: TDE2E. if: steps.cache-tde2e.outputs.cache-hit != 'true' @@ -140,7 +142,7 @@ jobs: cmake -Bbuild -GNinja . \ -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_INSTALL_PREFIX=$PWD/build/prefix \ + -DCMAKE_INSTALL_PREFIX=$LibrariesPath/local/tde2e \ -DCMAKE_C_FLAGS_DEBUG="" \ -DCMAKE_CXX_FLAGS_DEBUG="" \ -DTD_E2E_ONLY=ON @@ -150,11 +152,9 @@ jobs: - name: Telegram Desktop build. if: env.ONLY_CACHE == 'false' - env: - tg_owt_DIR: ${{ env.LibrariesPath }}/tg_owt/build - tde2e_DIR: ${{ env.LibrariesPath }}/tde2e/build/prefix run: | cd $REPO_NAME + export CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH$(find $LibrariesPath/local -mindepth 1 -maxdepth 1 -type d -exec printf ':%s' {} +)" DEFINE="" if [ -n "${{ matrix.defines }}" ]; then