From 1cfa8cc3390741dc015b4b819ef13dc32f1c1f9c Mon Sep 17 00:00:00 2001 From: ilya-fedin Date: Sun, 25 Jul 2021 18:11:52 +0000 Subject: [PATCH] Don't use Xcode generator on mac (#200) Unix Makefiles and Ninja generators have a way more nice output --- .github/workflows/mac-packaged.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mac-packaged.yml b/.github/workflows/mac-packaged.yml index 5d5c8b259..1f43d8aa5 100644 --- a/.github/workflows/mac-packaged.yml +++ b/.github/workflows/mac-packaged.yml @@ -183,7 +183,7 @@ jobs: env: tg_owt_DIR: ${{ env.LibrariesPath }}/tg_owt/build run: | - cd $REPO_NAME/Telegram + cd $REPO_NAME DEFINE="" if [ -n "${{ matrix.defines }}" ]; then @@ -194,16 +194,17 @@ jobs: echo "ARTIFACT_NAME=Kotatogram" >> $GITHUB_ENV fi - ./configure.sh \ + cmake -Bbuild . \ + -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_FIND_FRAMEWORK=LAST \ -DTDESKTOP_API_TEST=ON \ -DDESKTOP_APP_USE_PACKAGED_LAZY=ON \ -DDESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC=ON \ $DEFINE - cmake --build ../out --config Debug + cmake --build build -j$(sysctl -n hw.logicalcpu) - cd ../out/Debug + cd build macdeployqt Kotatogram.app codesign --remove-signature Kotatogram.app @@ -214,7 +215,7 @@ jobs: - name: Move artifact. if: env.UPLOAD_ARTIFACT == 'true' run: | - cd $REPO_NAME/out/Debug + cd $REPO_NAME/build mkdir artifact mv Kotatogram.dmg artifact/ - uses: actions/upload-artifact@master @@ -222,4 +223,4 @@ jobs: name: Upload artifact. with: name: ${{ env.ARTIFACT_NAME }} - path: ${{ env.REPO_NAME }}/out/Debug/artifact/ + path: ${{ env.REPO_NAME }}/build/artifact/