Merge pull request #41 from ilya-fedin/use-newer-opus-appimage
* Use the same Opus version as static binary * Use Ninja generator * Debug build in the test AppImage action should be used * Use Ninja backend in Windows action
This commit is contained in:
commit
7903946ed0
2 changed files with 35 additions and 9 deletions
27
.github/workflows/appimage.yml
vendored
27
.github/workflows/appimage.yml
vendored
|
|
@ -101,7 +101,7 @@ jobs:
|
||||||
sudo apt-get update && \
|
sudo apt-get update && \
|
||||||
sudo apt-get install libice-dev libsm-dev libicu-dev liblzma-dev zlib1g-dev \
|
sudo apt-get install libice-dev libsm-dev libicu-dev liblzma-dev zlib1g-dev \
|
||||||
git wget autoconf automake build-essential libtool pkg-config bison \
|
git wget autoconf automake build-essential libtool pkg-config bison \
|
||||||
libopus-dev libasound2-dev libpulse-dev portaudio19-dev libdrm-dev libfuse2 \
|
libasound2-dev libpulse-dev portaudio19-dev libdrm-dev libfuse2 \
|
||||||
libgtk-3-dev libgtk2.0-dev libatspi2.0-dev libgl1-mesa-dev libegl1-mesa-dev \
|
libgtk-3-dev libgtk2.0-dev libatspi2.0-dev libgl1-mesa-dev libegl1-mesa-dev \
|
||||||
libffi-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-xfixes0-dev \
|
libffi-dev libxcb1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-xfixes0-dev \
|
||||||
libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev \
|
libxcb-keysyms1-dev libxcb-icccm4-dev libxcb-render-util0-dev libxcb-util0-dev \
|
||||||
|
|
@ -264,6 +264,27 @@ jobs:
|
||||||
cd ../..
|
cd ../..
|
||||||
rm -rf dav1d
|
rm -rf dav1d
|
||||||
|
|
||||||
|
- name: Opus cache.
|
||||||
|
id: cache-opus
|
||||||
|
uses: actions/cache@v1
|
||||||
|
with:
|
||||||
|
path: ${{ env.LibrariesPath }}/opus
|
||||||
|
key: ${{ runner.OS }}-opus-${{ env.CACHE_KEY }}
|
||||||
|
- name: Opus.
|
||||||
|
if: steps.cache-opus.outputs.cache-hit != 'true'
|
||||||
|
run: |
|
||||||
|
cd $LibrariesPath
|
||||||
|
|
||||||
|
git clone -b v1.3 --depth=1 $GIT/xiph/opus
|
||||||
|
cd opus
|
||||||
|
./autogen.sh
|
||||||
|
./configure
|
||||||
|
make -j$(nproc)
|
||||||
|
- name: Opus install.
|
||||||
|
run: |
|
||||||
|
cd $LibrariesPath/opus
|
||||||
|
sudo make install
|
||||||
|
|
||||||
- name: FFmpeg cache.
|
- name: FFmpeg cache.
|
||||||
id: cache-ffmpeg
|
id: cache-ffmpeg
|
||||||
uses: actions/cache@v1
|
uses: actions/cache@v1
|
||||||
|
|
@ -541,14 +562,16 @@ jobs:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
./configure.sh \
|
./configure.sh \
|
||||||
|
-GNinja \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
|
-DCMAKE_CXX_FLAGS="-s" \
|
||||||
-DTDESKTOP_API_TEST=ON \
|
-DTDESKTOP_API_TEST=ON \
|
||||||
-DDESKTOP_APP_USE_PACKAGED_LAZY=ON \
|
-DDESKTOP_APP_USE_PACKAGED_LAZY=ON \
|
||||||
-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF \
|
-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF \
|
||||||
-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=OFF \
|
-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=OFF \
|
||||||
$DEFINE
|
$DEFINE
|
||||||
|
|
||||||
cd ../out/Release
|
cd ../out/Debug
|
||||||
cmake --build . -- -j$(nproc)
|
cmake --build . -- -j$(nproc)
|
||||||
DESTDIR=../../AppDir cmake --install .
|
DESTDIR=../../AppDir cmake --install .
|
||||||
|
|
||||||
|
|
|
||||||
17
.github/workflows/win.yml
vendored
17
.github/workflows/win.yml
vendored
|
|
@ -363,23 +363,26 @@ jobs:
|
||||||
if: env.ONLY_CACHE == 'false'
|
if: env.ONLY_CACHE == 'false'
|
||||||
shell: cmd
|
shell: cmd
|
||||||
run: |
|
run: |
|
||||||
cd %REPO_NAME%\Telegram
|
cd %REPO_NAME%
|
||||||
|
call vcvars32.bat
|
||||||
|
|
||||||
call configure.bat ^
|
cmake -B build . ^
|
||||||
|
-GNinja ^
|
||||||
|
-DCMAKE_BUILD_TYPE=Debug ^
|
||||||
|
-DCMAKE_C_COMPILER=cl ^
|
||||||
|
-DCMAKE_CXX_COMPILER=cl ^
|
||||||
-D TDESKTOP_API_TEST=ON ^
|
-D TDESKTOP_API_TEST=ON ^
|
||||||
-D DESKTOP_APP_USE_PACKAGED=OFF ^
|
-D DESKTOP_APP_USE_PACKAGED=OFF ^
|
||||||
%TDESKTOP_BUILD_DEFINE% ^
|
%TDESKTOP_BUILD_DEFINE% ^
|
||||||
-DCMAKE_SYSTEM_VERSION=%SDK%
|
-DCMAKE_SYSTEM_VERSION=%SDK%
|
||||||
|
|
||||||
call vcvars32.bat
|
cmake --build build
|
||||||
cd ..\out
|
|
||||||
msbuild -m Telegram.sln /nologo /p:Configuration=Debug,Platform=Win32
|
|
||||||
|
|
||||||
- name: Move artifact.
|
- name: Move artifact.
|
||||||
if: env.UPLOAD_ARTIFACT == 'true'
|
if: env.UPLOAD_ARTIFACT == 'true'
|
||||||
shell: cmd
|
shell: cmd
|
||||||
run: |
|
run: |
|
||||||
cd %REPO_NAME%\out\Debug
|
cd %REPO_NAME%\build\bin
|
||||||
mkdir artifact
|
mkdir artifact
|
||||||
move Kotatogram.exe artifact/
|
move Kotatogram.exe artifact/
|
||||||
move Updater.exe artifact/
|
move Updater.exe artifact/
|
||||||
|
|
@ -388,4 +391,4 @@ jobs:
|
||||||
if: env.UPLOAD_ARTIFACT == 'true'
|
if: env.UPLOAD_ARTIFACT == 'true'
|
||||||
with:
|
with:
|
||||||
name: ${{ env.ARTIFACT_NAME }}
|
name: ${{ env.ARTIFACT_NAME }}
|
||||||
path: ${{ env.REPO_NAME }}\out\Debug\artifact\
|
path: ${{ env.REPO_NAME }}\build\bin\artifact\
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue